From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:04:51 +0000 (+0900)
Subject: Merge branch 'jk/diff-color-moved-fix' into maint
X-Git-Tag: v2.15.1~39
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fd506238f0f067e5bc2d310882007132364f76f2?hp=-c

Merge branch 'jk/diff-color-moved-fix' into maint

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
---

fd506238f0f067e5bc2d310882007132364f76f2