Merge branch 'sb/diff-color-moved-config-option-fixup'
commit932b867be0cec606ec7355fc25de13ace42f4c71
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:31 +0000 (14 15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:31 +0000 (14 15:29 -0800)
treec1731816dc6bc7dbfc747bc0a5dfd441f0563b57
parent20b3bc155864730380e8186f7d71ee2196a79603
parentd173e799ea8fae7d6e4649b763d32d5f0ba82011
Merge branch 'sb/diff-color-moved-config-option-fixup'

Minor inconsistency fix.

* sb/diff-color-moved-config-option-fixup:
  diff: align move detection error handling with other options
diff.c
diff.h