Mercurial > public > mercurial-scm > hg
diff mercurial/merge.py @ 26606:2a405d307f8c
filemerge: also return whether the merge is complete
In future patches, we'll pause merges after the premerge step. After the
premerge step we'll return complete = False.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 11 Oct 2015 12:56:21 -0700 |
| parents | 56b2bcea2529 |
| children | a5ff66e6d77a |
line wrap: on
line diff
--- a/mercurial/merge.py Sun Oct 11 12:31:08 2015 -0700 +++ b/mercurial/merge.py Sun Oct 11 12:56:21 2015 -0700 @@ -310,8 +310,8 @@ f = self._repo.vfs('merge/' + hash) self._repo.wwrite(dfile, f.read(), flags) f.close() - r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca, - labels=labels) + complete, r = filemerge.filemerge(self._repo, self._local, lfile, fcd, + fco, fca, labels=labels) if r is None: # no real conflict del self._state[dfile]