--- a/mercurial/merge.py	Sat Oct 17 01:15:34 2015 +0900
+++ b/mercurial/merge.py	Sat Oct 17 01:15:34 2015 +0900
@@ -1277,7 +1277,7 @@
     # drop the second merge parent
     repo.dirstate.beginparentchange()
     repo.setparents(repo['.'].node(), nullid)
-    repo.dirstate.write()
+    repo.dirstate.write(repo.currenttransaction())
     # fix up dirstate for copies and renames
     copies.duplicatecopies(repo, ctx.rev(), pctx.rev())
     repo.dirstate.endparentchange()