##// END OF EJS Templates
merge: drop resolve state for mergers with identical contents (issue2680)
Matt Mackall -
r13549:6217040b stable
parent child Browse files
Show More
@@ -74,7 +74,10 b' class mergestate(object):'
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
General Comments 0
You need to be logged in to leave comments. Login now