##// END OF EJS Templates
patch: reverse _inlinediff output for consistency
Matthieu Laneuville -
r35311:10cce12f default
parent child Browse files
Show More
@@ -2515,7 +2515,7 b' def difflabel(func, *args, **kw):'
2515 yield (token, 'diff.tab')
2515 yield (token, 'diff.tab')
2516 else:
2516 else:
2517 if i in matches:
2517 if i in matches:
2518 for l, t in _inlinediff(
2518 for t, l in _inlinediff(
2519 lines[i].rstrip(),
2519 lines[i].rstrip(),
2520 lines[matches[i]].rstrip(),
2520 lines[matches[i]].rstrip(),
2521 label):
2521 label):
@@ -2587,10 +2587,10 b' def _inlinediff(s1, s2, operation):'
2587 token += part[2:]
2587 token += part[2:]
2588 continue
2588 continue
2589 else:
2589 else:
2590 buff.append((label, token))
2590 buff.append((token, label))
2591 label = l
2591 label = l
2592 token = part[2:]
2592 token = part[2:]
2593 buff.append((label, token))
2593 buff.append((token, label))
2594
2594
2595 return buff
2595 return buff
2596
2596
General Comments 0
You need to be logged in to leave comments. Login now