Submitter | phabricator |
---|---|
Date | Jan. 5, 2018, 5:38 a.m. |
Message ID | <1684c31f9a6cb8332939317da2322571@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/26556/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py --- a/mercurial/filemerge.py +++ b/mercurial/filemerge.py @@ -636,7 +636,8 @@ # merging in-memory, we must redirect the backup to the memory context # so we don't disturb the working directory. relpath = back[len(repo.wvfs.base) + 1:] - wctx[relpath].write(fcd.data(), fcd.flags()) + if premerge: + wctx[relpath].write(fcd.data(), fcd.flags()) return wctx[relpath] else: if premerge: