From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Oct 2017 04:29:19 +0000 (+0900)
Subject: Merge branch 'sb/diff-color-move'
X-Git-Tag: v2.15.0-rc2~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/91ccfb85176fbe2ed416751ff7884cdaf61311cb

Merge branch 'sb/diff-color-move'

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

91ccfb85176fbe2ed416751ff7884cdaf61311cb