Show More
@@ -1788,13 +1788,12 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||||
1788 | if opts.git: |
|
1788 | if opts.git: | |
1789 | revs = None |
|
1789 | revs = None | |
1790 |
|
1790 | |||
1791 |
|
|
1791 | addedset, removedset = set(added), set(removed) | |
1792 |
# Fix up |
|
1792 | # Fix up added, since merged-in additions appear as | |
1793 | # modifications during merges |
|
1793 | # modifications during merges | |
1794 |
for f in modified |
|
1794 | for f in modified: | |
1795 | if f not in ctx1: |
|
1795 | if f not in ctx1: | |
1796 | addedset.add(f) |
|
1796 | addedset.add(f) | |
1797 | modifiedset.remove(f) |
|
|||
1798 | for f in sorted(modified + added + removed): |
|
1797 | for f in sorted(modified + added + removed): | |
1799 | to = None |
|
1798 | to = None | |
1800 | tn = None |
|
1799 | tn = None |
General Comments 0
You need to be logged in to leave comments.
Login now