Show More
| @@ -278,7 +278,7 b' class DirstateItem:' | |||
|
|
278 | 278 | self._mtime_ns = None |
|
|
279 | 279 | |
|
|
280 | 280 | def drop_merge_data(self): |
|
|
281 | """remove all "merge-only" from a DirstateItem | |
|
|
281 | """remove all "merge-only" information from a DirstateItem | |
|
|
282 | 282 | |
|
|
283 | 283 | This is to be call by the dirstatemap code when the second parent is dropped |
|
|
284 | 284 | """ |
General Comments 0
You need to be logged in to leave comments.
Login now