Merge branch 'maint'
commit6a96b32d3b045c6e8d1b553fd6b64e03db9b0e45
authorJunio C Hamano <junkio@cox.net>
Thu, 9 Nov 2006 17:40:59 +0000 (9 09:40 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 9 Nov 2006 17:40:59 +0000 (9 09:40 -0800)
tree84cc69c74c96960d6315eadd0412daf18319d8dd
parent1c791cfbf843fee5c72b5b23c0c3ca8550e15c08
parent916d081bbaa40617643b09b6dc9c6760993cf6ed
Merge branch 'maint'

* maint:
  Nicer error messages in case saving an object to db goes wrong
sha1_file.c