diff -r 2b6a795f19f7 -r 28c43957f8b4 mercurial/commands.py
--- a/mercurial/commands.py	Sat Sep 22 14:53:50 2012 +0900
+++ b/mercurial/commands.py	Tue Sep 25 20:50:40 2012 +0300
@@ -4963,6 +4963,7 @@
                         ret = 1
                 finally:
                     ui.setconfig('ui', 'forcemerge', '')
+                    ms.commit()
 
                 # replace filemerge's .orig file with our resolve file
                 util.rename(a + ".resolve", a + ".orig")