Merge branch 'tr/sha1-file-silence-loose-object-info-under-prune-race'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:19 +0000 (11 13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:19 +0000 (11 13:31 -0700)
* tr/sha1-file-silence-loose-object-info-under-prune-race:
  sha1_file: silence sha1_loose_object_info

1  2 
sha1_file.c

diff --cc sha1_file.c
Simple merge