Show More
@@ -567,8 +567,7 b' class dirstate(object):' | |||
|
567 | 567 | self._drop(filename) |
|
568 | 568 | elif merged: |
|
569 | 569 | assert wc_tracked |
|
570 | if not self.in_merge: | |
|
571 | self.normallookup(filename) | |
|
570 | assert self.in_merge # we are never in the "normallookup" case | |
|
572 | 571 | self.otherparent(filename) |
|
573 | 572 | elif not (p1_tracked or p2_tracked) and wc_tracked: |
|
574 | 573 | self._addpath(filename, added=True, possibly_dirty=possibly_dirty) |
General Comments 0
You need to be logged in to leave comments.
Login now