equal
deleted
inserted
replaced
3103 index1 = _gitindex(content1) if path1 in ctx1 else nullhex |
3103 index1 = _gitindex(content1) if path1 in ctx1 else nullhex |
3104 index2 = _gitindex(content2) if path2 in ctx2 else nullhex |
3104 index2 = _gitindex(content2) if path2 in ctx2 else nullhex |
3105 if binary and opts.git and not opts.nobinary: |
3105 if binary and opts.git and not opts.nobinary: |
3106 text = mdiff.b85diff(content1, content2) |
3106 text = mdiff.b85diff(content1, content2) |
3107 if text: |
3107 if text: |
3108 header.append( |
3108 header.append(b'index %s..%s' % (index1, index2)) |
3109 b'index %s..%s' % (index1, index2) |
|
3110 ) |
|
3111 hunks = ((None, [text]),) |
3109 hunks = ((None, [text]),) |
3112 else: |
3110 else: |
3113 if opts.git and opts.index > 0: |
3111 if opts.git and opts.index > 0: |
3114 flag = flag1 |
3112 flag = flag1 |
3115 if flag is None: |
3113 if flag is None: |