From: Phillip Wood Date: Fri, 23 Nov 2018 11:16:55 +0000 (+0000) Subject: diff --color-moved=zebra: be stricter with color alternation X-Git-Tag: v2.21.0-rc0~70^2~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b0a2ba47761fa7bffb5a33e5a76f85da50a00ba5?hp=b0a2ba47761fa7bffb5a33e5a76f85da50a00ba5 diff --color-moved=zebra: be stricter with color alternation Currently when using --color-moved=zebra the color of moved blocks depends on the number of lines separating them. This means that adding an odd number of unmoved lines between blocks that are already separated by one or more unmoved lines will change the color of subsequent moved blocks. This does not make much sense as the blocks were already separated by unmoved lines and causes problems when adding lines to test cases. Fix this by only using the alternate colors for adjacent moved blocks. Signed-off-by: Phillip Wood Reviewed-by: Stefan Beller Signed-off-by: Junio C Hamano ---