diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-11-23 11:16:55 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-01-10 10:38:15 -0800 |
| commit | b0a2ba47761fa7bffb5a33e5a76f85da50a00ba5 (patch) | |
| tree | 399a1a35785824c4f2ed5cd7dbd20f2a1e61c6f6 /t/t6027-merge-binary.sh | |
| parent | diff --color-moved-ws: fix false positives (diff) | |
| download | tgif-b0a2ba47761fa7bffb5a33e5a76f85da50a00ba5.tar.xz | |
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 <phillip.wood@dunelm.org.uk>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6027-merge-binary.sh')
0 files changed, 0 insertions, 0 deletions