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)
commit706b0b5...8d683b06e99bdfb2349228b360e4cf03
tree6f1f5a5...673bd1d33bd43ae2552df5ed965ffc34copy hash to clipboard (tree)
parent1ba2fc6...3f4aa564e029843589ca0b36a8aed4fccopy hash to clipboard (diff)
parente3f2f5f...cd9238ae106434278d325eada2719842copy hash to clipboard (diff)
Documentation/diff-options.txt
diff.c
t/t4015-diff-whitespace.sh