--- a/mercurial/merge.py Wed Nov 18 13:55:31 2015 -0800
+++ b/mercurial/merge.py Wed Nov 18 14:22:52 2015 -0800
@@ -432,11 +432,13 @@
f = self._repo.vfs('merge/' + hash)
self._repo.wwrite(dfile, f.read(), flags)
f.close()
- complete, r = filemerge.premerge(self._repo, self._local, lfile,
- fcd, fco, fca, labels=labels)
+ complete, r, deleted = filemerge.premerge(self._repo, self._local,
+ lfile, fcd, fco, fca,
+ labels=labels)
else:
- complete, r = filemerge.filemerge(self._repo, self._local, lfile,
- fcd, fco, fca, labels=labels)
+ complete, r, deleted = filemerge.filemerge(self._repo, self._local,
+ lfile, fcd, fco, fca,
+ labels=labels)
if r is None:
# no real conflict
del self._state[dfile]