Merge branch 'sb/diff-color-move'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Oct 2017 04:29:19 +0000 (13:29 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Oct 2017 04:29:19 +0000 (13:29 +0900)
A recently added "--color-moved" feature of "diff" fell into
infinite loop when ignoring whitespace changes, which has been
fixed.

* sb/diff-color-move:
  diff: fix infinite loop with --color-moved --ignore-space-change

1  2 
diff.c
t/t4015-diff-whitespace.sh

diff --cc diff.c
Simple merge
Simple merge