Merge branch 'jk/combine-diff-binary-etc' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:24 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:24 +0000 (11:23 -0700)
commite10e476...b170a99ecc535a31def69d5e3483a859
tree6987fb0...85bcbdb69b5a7ad1ec5652df4a49b80ccopy hash to clipboard (tree)
parent2a6f08a...1f6949ed0072aed3240bc04d80051851copy hash to clipboard (diff)
parent0508fe5...3dfe1b890f6a2d31ca42ba25466e8ff5copy hash to clipboard (diff)
diff.c
userdiff.c