Merge branch 'np/diff-in-corrupt-repository'
commitf5a5531e4e08c22ff1c3f02c43954896b947b158
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)
tree3a9f543e07f7a3db4151288a4be08204aa060da3
parentf3f973a0176d5fe7870ca4f27085d347b96307d2
parentc50c4316e1eed362bee387e4cbfbe1138957f75b
Merge branch 'np/diff-in-corrupt-repository'

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