Merge branch 'ks/combine-diff'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Mar 2014 23:06:26 +0000 (15:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Mar 2014 23:06:26 +0000 (15:06 -0800)
commit6376463...37e0371a411013b90b2e8fc0f7d27dfa
treed2f08dd...6391e6afad72a825bbd072ef53683281copy hash to clipboard (tree)
parent2de3478...dfcbb4fe0febe9ab98e0b99138040109copy hash to clipboard (diff)
parentfce135c...ffc87f85e1c3b5c57a6d9e1abdbd074dcopy hash to clipboard (diff)
diff-lib.c
diffcore.h