Merge branch 'jc/combine-diff-many-parents'
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:29:07 +0000 (15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Feb 2013 23:29:07 +0000 (15:29 -0800)
commit4dd7c77...19d42f6981ba4cdcda91755e5587cc28
tree0003225...8e58ad22ce7f23beb9d5c98df4518369copy hash to clipboard (tree)
parentecf6778...8ef243dd9b34eef57212c44baffb13a2copy hash to clipboard (diff)
parentedbc00e...6d29213010db947d8d7bff3baab12a35copy hash to clipboard (diff)