diff -r 2f1fce0d4e86 -r dfd9811c5c9b mercurial/commands.py
--- a/mercurial/commands.py	Sun Oct 11 18:37:54 2015 -0700
+++ b/mercurial/commands.py	Sun Oct 11 20:12:12 2015 -0700
@@ -5589,7 +5589,10 @@
                     # resolve file
                     ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
                                  'resolve')
-                    if ms.resolve(f, wctx):
+                    complete, r = ms.preresolve(f, wctx)
+                    if not complete:
+                        r = ms.resolve(f, wctx)
+                    if r:
                         ret = 1
                 finally:
                     ui.setconfig('ui', 'forcemerge', '', 'resolve')