projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 56b5e94) | patch
git-merge: Exit with code 2 if no strategy was able to handle the merge.
authorFredrik Kuivinen <freku045@student.liu.se>
Sat, 3 Dec 2005 10:40:21 +0000 (11:40 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Dec 2005 20:28:52 +0000 (12:28 -0800)
commit4275df517022604f5c33ba05ae45a885b84e3472
tree08dc35c3961c38ac1522b6ec2e7d7ff803291e50tree | snapshot
parent56b5e946f2ba4fd57bbe14f9e3ec2e0ae314d5e6commit | diff
git-merge: Exit with code 2 if no strategy was able to handle the merge.

This way it is possible to test in scripts if the merge was non-clean
or if the strategy had other problems with the merge.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh diff | blob | history
The core git plumbing