--- a/mercurial/merge.py Mon Sep 11 18:07:29 2017 +0200
+++ b/mercurial/merge.py Mon Sep 11 13:03:27 2017 -0700
@@ -495,12 +495,14 @@
f.close()
else:
wctx[dfile].remove(ignoremissing=True)
- complete, r, deleted = filemerge.premerge(self._repo, self._local,
- lfile, fcd, fco, fca,
+ complete, r, deleted = filemerge.premerge(self._repo, wctx,
+ self._local, lfile, fcd,
+ fco, fca,
labels=self._labels)
else:
- complete, r, deleted = filemerge.filemerge(self._repo, self._local,
- lfile, fcd, fco, fca,
+ complete, r, deleted = filemerge.filemerge(self._repo, wctx,
+ self._local, lfile, fcd,
+ fco, fca,
labels=self._labels)
if r is None:
# no real conflict