Merge branch 'cb/binary-patch-id' into next
commitff38c3e767397e8ac06af6474a0007742184c21a
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:33:13 +0000 (21 23:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Aug 2010 06:33:13 +0000 (21 23:33 -0700)
treee3ebc01650ba5b683c08eaa3f82c7e11cb003e09
parent737dfece60ca7cb7635c0cce552630c35371a0e9
parent34597c1f5a77c710dae33092cb8a7cb01c6b21c1
Merge branch 'cb/binary-patch-id' into next

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