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)
commit4275df5...7022604f5c33ba05ae45a885b84e3472
tree08dc35c...961c38ac1522b6ec2e7d7ff803291e50copy hash to clipboard (tree)
parent56b5e94...f2ba4fd57bbe14f9e3ec2e0ae314d5e6copy hash to clipboard (diff)
git-merge.sh