Show More
@@ -2443,7 +2443,7 b' def diffhunks(repo, node1=None, node2=No' | |||||
2443 | modified = sorted(modifiedset) |
|
2443 | modified = sorted(modifiedset) | |
2444 | added = sorted(addedset) |
|
2444 | added = sorted(addedset) | |
2445 | removed = sorted(removedset) |
|
2445 | removed = sorted(removedset) | |
2446 | for dst, src in copy.items(): |
|
2446 | for dst, src in list(copy.items()): | |
2447 | if src not in ctx1: |
|
2447 | if src not in ctx1: | |
2448 | # Files merged in during a merge and then copied/renamed are |
|
2448 | # Files merged in during a merge and then copied/renamed are | |
2449 | # reported as copies. We want to show them in the diff as additions. |
|
2449 | # reported as copies. We want to show them in the diff as additions. |
General Comments 0
You need to be logged in to leave comments.
Login now