diff --git a/mercurial/commands.py b/mercurial/commands.py
index 2b6a795f19f71b1b78b304fe2c97462dc40a490b_bWVyY3VyaWFsL2NvbW1hbmRzLnB5..28c43957f8b4dc797feaaace9aa9fd40ff62745d_bWVyY3VyaWFsL2NvbW1hbmRzLnB5 100644
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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")