diff -r ea81f8b2364e -r ba6486076429 mercurial/merge.py
--- a/mercurial/merge.py	Fri Nov 01 17:08:06 2013 -0700
+++ b/mercurial/merge.py	Wed Nov 06 10:20:18 2013 -0800
@@ -384,7 +384,7 @@
     return actions
 
 def actionkey(a):
-    return a[1] == "r" and -1 or 0, a
+    return a[1] in "rf" and -1 or 0, a
 
 def getremove(repo, mctx, overwrite, args):
     """apply usually-non-interactive updates to the working directory