--- a/mercurial/commands.py Wed Sep 22 15:33:08 2010 -0500
+++ b/mercurial/commands.py Mon Sep 06 17:35:49 2010 +0200
@@ -2990,6 +2990,8 @@
# replace filemerge's .orig file with our resolve file
util.rename(a + ".resolve", a + ".orig")
+
+ ms.commit()
return ret
def revert(ui, repo, *pats, **opts):