equal
deleted
inserted
replaced
532 elif src not in mb: |
532 elif src not in mb: |
533 # Work around the "short-circuit to avoid issues with merge states" |
533 # Work around the "short-circuit to avoid issues with merge states" |
534 # thing in pathcopies(): pathcopies(x, y) can return a copy where the |
534 # thing in pathcopies(): pathcopies(x, y) can return a copy where the |
535 # destination doesn't exist in y. |
535 # destination doesn't exist in y. |
536 pass |
536 pass |
537 elif m2[src] != mb[src]: |
537 elif mb[src] != m2[src] and not _related(c2[src], base[src]): |
538 if not _related(c2[src], base[src]): |
538 return |
539 return |
539 elif mb[src] != m2[src] or mb.flags(src) != m2.flags(src): |
540 # modified on side 2 |
540 # modified on side 2 |
541 for dst in dsts1: |
541 for dst in dsts1: |
542 copy[dst] = src |
542 copy[dst] = src |
543 |
543 |
544 |
544 |