equal
deleted
inserted
replaced
72 f.close() |
72 f.close() |
73 fcd = wctx[dfile] |
73 fcd = wctx[dfile] |
74 fco = octx[ofile] |
74 fco = octx[ofile] |
75 fca = self._repo.filectx(afile, fileid=anode) |
75 fca = self._repo.filectx(afile, fileid=anode) |
76 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) |
76 r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca) |
77 if not r: |
77 if r is None: |
|
78 # no real conflict |
|
79 del self._state[dfile] |
|
80 elif not r: |
78 self.mark(dfile, 'r') |
81 self.mark(dfile, 'r') |
79 return r |
82 return r |
80 |
83 |
81 def _checkunknown(wctx, mctx): |
84 def _checkunknown(wctx, mctx): |
82 "check for collisions between unknown files and files in mctx" |
85 "check for collisions between unknown files and files in mctx" |