Merge branch 'jc/ws-error-highlight'
authorJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:43 +0000 (13:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 26 Oct 2016 20:14:43 +0000 (13:14 -0700)
commite5272d3...4af3528163cd5faa822f88086448ae57
tree3790db4...783219a328cfd83be301fbb3ee7eb0dfcopy hash to clipboard (tree)
parentc334eff...2332e30199451695b148f02eb7d9fd13copy hash to clipboard (diff)
parenta17505f...62b62e429bb0e188c5ed73ac749e25b8copy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/diff-options.txt
diff.c