Show More
@@ -2316,13 +2316,13 b' def diff(repo, node1=None, node2=None, m' | |||
|
2316 | 2316 | |
|
2317 | 2317 | copy, if not empty, should contain mappings {dst@y: src@x} of copy |
|
2318 | 2318 | information.''' |
|
2319 |
for h |
|
|
2319 | for hdr, hunks in diffhunks(repo, node1=node1, node2=node2, match=match, | |
|
2320 | 2320 |
|
|
2321 | 2321 |
|
|
2322 | 2322 |
|
|
2323 | 2323 | text = ''.join(sum((list(hlines) for hrange, hlines in hunks), [])) |
|
2324 |
if h |
|
|
2325 |
yield '\n'.join(h |
|
|
2324 | if hdr and (text or len(hdr) > 1): | |
|
2325 | yield '\n'.join(hdr) + '\n' | |
|
2326 | 2326 | if text: |
|
2327 | 2327 | yield text |
|
2328 | 2328 |
General Comments 0
You need to be logged in to leave comments.
Login now