equal
deleted
inserted
replaced
1754 and copy[copyto[f]] == f)): |
1754 and copy[copyto[f]] == f)): |
1755 dodiff = False |
1755 dodiff = False |
1756 else: |
1756 else: |
1757 header.append('deleted file mode %s\n' % |
1757 header.append('deleted file mode %s\n' % |
1758 gitmode[man1.flags(f)]) |
1758 gitmode[man1.flags(f)]) |
|
1759 if util.binary(to): |
|
1760 dodiff = 'binary' |
1759 elif not to or util.binary(to): |
1761 elif not to or util.binary(to): |
1760 # regular diffs cannot represent empty file deletion |
1762 # regular diffs cannot represent empty file deletion |
1761 losedatafn(f) |
1763 losedatafn(f) |
1762 else: |
1764 else: |
1763 oflag = man1.flags(f) |
1765 oflag = man1.flags(f) |