Merge branch 'np/diff-in-corrupt-repository'
authorJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (29 17:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 30 Nov 2010 01:52:33 +0000 (29 17:52 -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