From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sat, 3 Dec 2005 10:40:21 +0000 (+0100)
Subject: git-merge: Exit with code 2 if no strategy was able to handle the merge.
X-Git-Tag: v0.99.9l^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4275df517022604f5c33ba05ae45a885b84e3472;p=git.git

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>
---

diff --git a/git-merge.sh b/git-merge.sh
index d352a3cf6..a221daa7f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -273,7 +273,8 @@ fi
 case "$best_strategy" in
 '')
 	restorestate
-	die "No merge strategy handled the merge."
+	echo >&2 "No merge strategy handled the merge."
+	exit 2
 	;;
 "$wt_strategy")
 	# We already have its result in the working tree.