From 4275df517022604f5c33ba05ae45a885b84e3472 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sat, 3 Dec 2005 11:40:21 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-merge.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-merge.sh b/git-merge.sh index d352a3cf..a221daa7 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. -- 2.11.0