]> asedeno.scripts.mit.edu Git - git.git/commitdiff
Merge branch 'lt/racy-empty' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Jul 2008 07:19:17 +0000 (00:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jul 2008 07:19:17 +0000 (00:19 -0700)
* lt/racy-empty:
  racy-git: an empty blob has a fixed object name

1  2 
read-cache.c

diff --cc read-cache.c
Simple merge