From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Aug 2017 05:55:04 +0000 (-0700)
Subject: Merge branch 'jt/diff-color-move-fix'
X-Git-Tag: v2.15.0-rc0~129
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0b9635847944f97079fc6c2283063cd3a0ed0271

Merge branch 'jt/diff-color-move-fix'

A handful of bugfixes and an improvement to "diff --color-moved".

* jt/diff-color-move-fix:
diff: define block by number of alphanumeric chars
diff: respect MIN_BLOCK_LENGTH for last block
diff: avoid redundantly clearing a flag
---

0b9635847944f97079fc6c2283063cd3a0ed0271