summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 10:00:39 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 10:00:39 (GMT)
commit1349f8771310987dd07b679a512e46e1b17e2b8d (patch)
tree168b3c978744f1bc43de4f7c1b3924969ea92c21 /git-merge.sh
parenta159ca0cb7e0acdd37cb066327dcb020d95602d0 (diff)
parent155bd0ce23144e5c7067965a22646523f1a38b51 (diff)
downloadgit-1349f8771310987dd07b679a512e46e1b17e2b8d.zip
git-1349f8771310987dd07b679a512e46e1b17e2b8d.tar.gz
git-1349f8771310987dd07b679a512e46e1b17e2b8d.tar.bz2
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
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions