Merge branch 'maint'
commit1349f8771310987dd07b679a512e46e1b17e2b8d
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 10:00:39 +0000 (13 02:00 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 10:00:39 +0000 (13 02:00 -0800)
tree168b3c978744f1bc43de4f7c1b3924969ea92c21
parenta159ca0cb7e0acdd37cb066327dcb020d95602d0
parent155bd0ce23144e5c7067965a22646523f1a38b51
Merge branch 'maint'

* maint:
  git-svn: correctly display fatal() error messages
  git-svn: exit with status 1 for test failures

Conflicts:

git-svn.perl

nothing to commit