summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-12-03 10:40:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-03 20:28:52 (GMT)
commit4275df517022604f5c33ba05ae45a885b84e3472 (patch)
tree08dc35c3961c38ac1522b6ec2e7d7ff803291e50 /git-merge.sh
parent56b5e946f2ba4fd57bbe14f9e3ec2e0ae314d5e6 (diff)
downloadgit-4275df517022604f5c33ba05ae45a885b84e3472.zip
git-4275df517022604f5c33ba05ae45a885b84e3472.tar.gz
git-4275df517022604f5c33ba05ae45a885b84e3472.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh3
1 files changed, 2 insertions, 1 deletions
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.