Merge branch 'es/diff-color-moved-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:22 +0000 (15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Aug 2018 22:08:22 +0000 (15:08 -0700)
commit706b0b5e8d683b06e99bdfb2349228b360e4cf03
tree6f1f5a53673bd1d33bd43ae2552df5ed965ffc34
parent1ba2fc603f4aa564e029843589ca0b36a8aed4fc
parente3f2f5f9cd9238ae106434278d325eada2719842
Merge branch 'es/diff-color-moved-fix'

One of the "diff --color-moved" mode "dimmed_zebra" that was named
in an unusual way has been deprecated and replaced by
"dimmed-zebra".

* es/diff-color-moved-fix:
  diff: --color-moved: rename "dimmed_zebra" to "dimmed-zebra"
Documentation/diff-options.txt
diff.c
t/t4015-diff-whitespace.sh