[PATCH 1/4] git-merge: Exit with code 2 if no strategy was able to handle the merge.

From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Dec 3, 2005, 10:40 UTC
Message-ID: <20051203104021.GB4896@c165.ib.student.liu.se>
In-Reply-To: <20051203103255.GA4896@c165.ib.student.liu.se>

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>

---

 git-merge.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

8fb7e4ef2b13f85966976c567cefb6a6d4c18c29

diff --git a/git-merge.sh b/git-merge.sh
index d352a3c..a221daa 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.

-- 
0.99.9.GIT