Show More
@@ -397,9 +397,9 b' def _merge_copies_dict(minor, major, isa' | |||
|
397 | 397 | and dest in changes.salvaged |
|
398 | 398 | ): |
|
399 | 399 | minor[dest] = value |
|
400 | elif not isancestor(new_tt, other_tt): | |
|
400 | elif changes is not None and dest in changes.merged: | |
|
401 | 401 | minor[dest] = value |
|
402 | elif changes is not None and dest in changes.merged: | |
|
402 | elif not isancestor(new_tt, other_tt): | |
|
403 | 403 | minor[dest] = value |
|
404 | 404 | |
|
405 | 405 |
General Comments 0
You need to be logged in to leave comments.
Login now