Merge branch 'np/diff-in-corrupt-repository' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:39 +0000 (10:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Dec 2010 18:36:39 +0000 (10:36 -0800)
commit8577def6fc1dda3f18a284162aba07819fbcbcd4
tree8673e563e044c1faeead872c365a7f9a1582e8d9
parenta59c87265b917eb0d1b95c73ed829d47ee2ded6b
parentc50c4316e1eed362bee387e4cbfbe1138957f75b
Merge branch 'np/diff-in-corrupt-repository' into maint

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