changeset 13536 | fac040b7e822 |
parent 13437 | 6169493ac3f9 |
child 13550 | 1792b8a9422b |
--- a/mercurial/merge.py Fri Mar 04 19:21:36 2011 -0600 +++ b/mercurial/merge.py Sat Mar 05 16:34:59 2011 -0600 @@ -74,7 +74,10 @@ fco = octx[ofile] fca = self._repo.filectx(afile, fileid=anode) r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) - if not r: + if r is None: + # no real conflict + del self._state[dfile] + elif not r: self.mark(dfile, 'r') return r