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)
* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing

1  2 
diff.c

diff --cc diff.c
Simple merge