diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:23 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-06 13:11:23 +0900 |
| commit | 7a55427094c33de1f0e6465feb26f2964b3fe558 (patch) | |
| tree | 5658cf1e088b2494ad6e96492c288cf3a873b327 /unpack-trees.h | |
| parent | Merge branch 'kd/auto-col-with-pager-fix' (diff) | |
| parent | diff: handle NULs in get_string_hash() (diff) | |
| download | tgif-7a55427094c33de1f0e6465feb26f2964b3fe558.tar.xz | |
Merge branch 'jk/diff-color-moved-fix'
The experimental "color moved lines differently in diff output"
feature was buggy around "ignore whitespace changes" edges, whihch
has been corrected.
* jk/diff-color-moved-fix:
diff: handle NULs in get_string_hash()
diff: fix whitespace-skipping with --color-moved
t4015: test the output of "diff --color-moved -b"
t4015: check "negative" case for "-w --color-moved"
t4015: refactor --color-moved whitespace test
Diffstat (limited to 'unpack-trees.h')
0 files changed, 0 insertions, 0 deletions