Code

Merge branch 'np/diff-in-corrupt-repository' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:09 +0000 (14:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Nov 2010 22:39:09 +0000 (14:39 -0800)
commitb57a6cb8403a374f473f537d19686585e022e7ee
tree9876a1906f1a3d5b310bb1cf6235858e77a90920
parent69a9f4600323292c3f4123e90a5ed851a63d625b
parentc50c4316e1eed362bee387e4cbfbe1138957f75b
Merge branch 'np/diff-in-corrupt-repository' into next

* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing
diff.c