Merge branch 'jk/combine-diff-binary-etc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
commitdbae1a1...363c45d3f77061f61ca73a0c3ed045cf
treee20c722...570b55dbcb4ce4cf9bb91ae8149f52bacopy hash to clipboard (tree)
parent5dc6411...dc6ed5d822b65b9f5cf61ab6fe6d3fa8copy hash to clipboard (diff)
parent0508fe5...3dfe1b890f6a2d31ca42ba25466e8ff5copy hash to clipboard (diff)
diff.c
userdiff.c