equal
deleted
inserted
replaced
2547 header.append('index %s..%s %s' % |
2547 header.append('index %s..%s %s' % |
2548 (gitindex(content1)[0:opts.index], |
2548 (gitindex(content1)[0:opts.index], |
2549 gitindex(content2)[0:opts.index], |
2549 gitindex(content2)[0:opts.index], |
2550 gitmode[flag])) |
2550 gitmode[flag])) |
2551 |
2551 |
2552 text = mdiff.unidiff(content1, date1, |
2552 uheaders, text = mdiff.unidiff(content1, date1, |
2553 content2, date2, |
2553 content2, date2, |
2554 path1, path2, opts=opts) |
2554 path1, path2, opts=opts) |
|
2555 header.extend(uheaders) |
2555 if header and (text or len(header) > 1): |
2556 if header and (text or len(header) > 1): |
2556 yield '\n'.join(header) + '\n' |
2557 yield '\n'.join(header) + '\n' |
2557 if text: |
2558 if text: |
2558 yield text |
2559 yield text |
2559 |
2560 |