Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 34125 57dc78d757ff
parent 34124 b90e5b2a9c82
child 34142 24bf823377fc 
--- a/mercurial/merge.py	Mon Sep 11 13:03:27 2017 -0700
+++ b/mercurial/merge.py	Mon Sep 11 13:17:43 2017 -0700
@@ -1712,6 +1712,7 @@
             repo.vfs.write('updatestate', p2.hex())
 
         stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
+        wc.flushall()
 
         if not partial:
             with repo.dirstate.parentchange():
Mercurial