Show More
| @@ -563,7 +563,6 b' class dirstate(object):' | |||||
| 563 | if merged and (clean_p1 or clean_p2): |
|
563 | if merged and (clean_p1 or clean_p2): | |
| 564 | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
|
564 | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' | |
| 565 | raise error.ProgrammingError(msg) |
|
565 | raise error.ProgrammingError(msg) | |
| 566 | assert not (merged and (clean_p1 or clean_p1)) |
|
|||
| 567 | if not (p1_tracked or p2_tracked or wc_tracked): |
|
566 | if not (p1_tracked or p2_tracked or wc_tracked): | |
| 568 | self._drop(filename) |
|
567 | self._drop(filename) | |
| 569 | elif merged: |
|
568 | elif merged: | |
General Comments 0
You need to be logged in to leave comments.
Login now