Merge branch 'jk/color-diff-plain-is-context'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:53 +0000 (09:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Jun 2015 16:29:53 +0000 (09:29 -0700)
commitdb65170...e5558b47355e7f9f111aecb5b152d4d9
tree475abf3...cf47918b0e2d01b01ace04d20c498898copy hash to clipboard (tree)
parent82b416e...63d9b1497eac78a8deaad340d251f1dccopy hash to clipboard (diff)
parent8dbf3eb...850d6d9495ace908625fe50888b111e6copy hash to clipboard (diff)
Documentation/config.txt
combine-diff.c
diff.c
diff.h
line-log.c