# HG changeset patch # User Matthieu Laneuville # Date 1512719238 -32400 # Node ID 10cce12fdcd3d816c6c7b8275f182f318dfa10bd # Parent d13526333835c6c539c346075354e78aa8132678 patch: reverse _inlinediff output for consistency diff -r d13526333835 -r 10cce12fdcd3 mercurial/patch.py --- a/mercurial/patch.py Wed Dec 06 15:46:41 2017 +0100 +++ b/mercurial/patch.py Fri Dec 08 16:47:18 2017 +0900 @@ -2515,7 +2515,7 @@ yield (token, 'diff.tab') else: if i in matches: - for l, t in _inlinediff( + for t, l in _inlinediff( lines[i].rstrip(), lines[matches[i]].rstrip(), label): @@ -2587,10 +2587,10 @@ token += part[2:] continue else: - buff.append((label, token)) + buff.append((token, label)) label = l token = part[2:] - buff.append((label, token)) + buff.append((token, label)) return buff