summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Fredrik Kuivinen <freku045@student.liu.se>2005-12-03 11:40:21 +0100
committerLibravatar Junio C Hamano <junkio@cox.net>2005-12-03 12:28:52 -0800
commit4275df517022604f5c33ba05ae45a885b84e3472 (patch)
tree08dc35c3961c38ac1522b6ec2e7d7ff803291e50
parentdocumentation: git-tag (diff)
downloadtgif-4275df517022604f5c33ba05ae45a885b84e3472.tar.xz
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>
-rwxr-xr-xgit-merge.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index d352a3cf65..a221daa7f4 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.