Merge branch 'jk/unpack-entry-fallback-to-another'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:20 +0000 (14:53 -0700)
* jk/unpack-entry-fallback-to-another:
unpack_entry: do not die when we fail to apply a delta
t5303: drop "count=1" from corruption dd

1  2 
sha1_file.c
diff --cc sha1_file.c
Simple merge