From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 20 Aug 2017 06:07:18 +0000 (-0700)
Subject: Merge branch 'jt/diff-color-move-fix' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6ae3831c8c1df5e569e826b087ff5be18829124b

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

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

6ae3831c8c1df5e569e826b087ff5be18829124b