Show More
@@ -271,6 +271,7 b' class mergestate(object):' | |||||
271 | if r is None: |
|
271 | if r is None: | |
272 | # no real conflict |
|
272 | # no real conflict | |
273 | del self._state[dfile] |
|
273 | del self._state[dfile] | |
|
274 | self._dirty = True | |||
274 | elif not r: |
|
275 | elif not r: | |
275 | self.mark(dfile, 'r') |
|
276 | self.mark(dfile, 'r') | |
276 | return r |
|
277 | return r |
General Comments 0
You need to be logged in to leave comments.
Login now