Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:18 +0000 (15:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Aug 2019 22:18:18 +0000 (15:18 -0700)
commitae76814...6ca1af63f947c3525dfd1a799c3d9fd4
tree1b37970...2a541ad4550465061efc718e83e5e354copy hash to clipboard (tree)
parent4d8ec15...66f32e29e4dfcdf64d0826c425d8ad7dcopy hash to clipboard (diff)
parentb777f3f...619ac2af507ffd3e7c5fe0d6e36e81f2copy hash to clipboard (diff)
t/t4015-diff-whitespace.sh