diff -r b90e5b2a9c82 -r 57dc78d757ff mercurial/merge.py
--- 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():