Show More
@@ -382,7 +382,6 b' class _mergestate_base(object):' | |||||
382 | if merge_ret is None: |
|
382 | if merge_ret is None: | |
383 | # If return value of merge is None, then there are no real conflict |
|
383 | # If return value of merge is None, then there are no real conflict | |
384 | del self._state[dfile] |
|
384 | del self._state[dfile] | |
385 | self._stateextras.pop(dfile, None) |
|
|||
386 | self._dirty = True |
|
385 | self._dirty = True | |
387 | elif not merge_ret: |
|
386 | elif not merge_ret: | |
388 | self.mark(dfile, MERGE_RECORD_RESOLVED) |
|
387 | self.mark(dfile, MERGE_RECORD_RESOLVED) |
General Comments 0
You need to be logged in to leave comments.
Login now