Show More
@@ -102,6 +102,7 b' class DirstateItem(object):' | |||
|
102 | 102 | msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`' |
|
103 | 103 | raise error.ProgrammingError(msg) |
|
104 | 104 | |
|
105 | assert not (merged and not p1_tracked) | |
|
105 | 106 | self._wc_tracked = wc_tracked |
|
106 | 107 | self._p1_tracked = p1_tracked |
|
107 | 108 | self._p2_tracked = p2_tracked |
General Comments 0
You need to be logged in to leave comments.
Login now