Merge branch 'jk/colors'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:58 +0000 (12:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:27:58 +0000 (12:27 -0800)
commit3dadfc7...173e27db641291d8f049ab487b696704
tree6d5f730...c8994fe9135278eab8790ac342285851copy hash to clipboard (tree)
parentd539eb9...25fdb9a7d820596eb11b04960d8d09eecopy hash to clipboard (diff)
parent71b5984...753589c3faa04176e875071417ceddd5copy hash to clipboard (diff)
Documentation/config.txt
contrib/diff-highlight/diff-highlight