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

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

1  2 
diff.c
diff.h

diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge