Andrew's git / gitweb.git / diff
?
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)
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>
No differences found