Merge branch 'jt/diff-color-move-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:04 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:04 +0000 (22:55 -0700)
commit0b9635847944f97079fc6c2283063cd3a0ed0271
treea6bf49bea76fa9cd5d700657f7beeea150714f7d
parentb6c4058f978433c51581df87283309b611bde87b
parentf0b8fb6e591b50b72b921f2c4cf120ebd284f510
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
Documentation/diff-options.txt
diff.c