equal
deleted
inserted
replaced
1264 nmode = gitmode[ctx2.flags(f)] |
1264 nmode = gitmode[ctx2.flags(f)] |
1265 _addmodehdr(header, omode, nmode) |
1265 _addmodehdr(header, omode, nmode) |
1266 if util.binary(to) or util.binary(tn): |
1266 if util.binary(to) or util.binary(tn): |
1267 dodiff = 'binary' |
1267 dodiff = 'binary' |
1268 r = None |
1268 r = None |
1269 header.insert(0, 'diff --git a/%s b/%s\n' % (a, b)) |
1269 header.insert(0, mdiff.diffline(r, a, b, opts)) |
1270 if dodiff: |
1270 if dodiff: |
1271 if dodiff == 'binary': |
1271 if dodiff == 'binary': |
1272 text = b85diff(to, tn) |
1272 text = b85diff(to, tn) |
1273 else: |
1273 else: |
1274 text = mdiff.unidiff(to, date1, |
1274 text = mdiff.unidiff(to, date1, |