Merge branch 'cb/binary-patch-id'
commit7cc1e385a0b0caa27de714a6c7242b14bf023a65
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:24:48 +0000 (31 16:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Aug 2010 23:24:48 +0000 (31 16:24 -0700)
treed946391be671555b2ce561fada2d4d1bb3c6c93c
parent0c1c798f20bb9956312247e091b23ba2e7baf7b4
parent34597c1f5a77c710dae33092cb8a7cb01c6b21c1
Merge branch 'cb/binary-patch-id'

* cb/binary-patch-id:
  hash binary sha1 into patch id
diff.c