Submitter | phabricator |
---|---|
Date | Sept. 12, 2017, 10:30 p.m. |
Message ID | <8aef98eff9c8537aa1f26b85353ab136@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/23818/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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():