Merge branch 'jc/diff-ws-error-highlight'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:51 +0000 (09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:51 +0000 (09:29 -0700)
commit709cd91...d4663af87903d3d278a3bab9d4d84153
tree416e3f1...bd0b50ef317b59bbb337f3a7bea72765copy hash to clipboard (tree)
parent7974889...053574e449b55ca543a486e38e74864fcopy hash to clipboard (diff)
parentb8767f7...1c15f119554c1466af60e4f2433ae971copy hash to clipboard (diff)
Documentation/diff-options.txt
diff.c
diff.h