Skip to content
Snippets Groups Projects
Commit 9a50ffd15b25 authored by Phil Cohen's avatar Phil Cohen
Browse files

filemerge: only write in-memory backup during premerge

This wasn't broken, but should mirror the non-in memory case to save an extra
write.

Differential Revision: https://phab.mercurial-scm.org/D1807
parent c0439e11af16
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment