Code

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

1  2 
diff.c

diff --cc diff.c
Simple merge