summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-13 17:32:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 17:33:08 (GMT)
commit0c4e95d083f77de03a64b65f5633ed0ba082a26e (patch)
tree63f38b5f79a372a14d4ea5f2fa39556149781fdf /git-merge.sh
parent8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 (diff)
downloadgit-0c4e95d083f77de03a64b65f5633ed0ba082a26e.zip
git-0c4e95d083f77de03a64b65f5633ed0ba082a26e.tar.gz
git-0c4e95d083f77de03a64b65f5633ed0ba082a26e.tar.bz2
git merge: reword failure message.
99.9999% of the time, the command is used with a single strategy; after a merge failure, saying "No strategy handled the merge" is technically correct, but there is no point stressing we tried and failed all the possibilities the user has given. Just say that it failed. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index a948878..2f3d936 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -400,7 +400,14 @@ fi
case "$best_strategy" in
'')
restorestate
- echo >&2 "No merge strategy handled the merge."
+ case "$use_strategies" in
+ ?*' '?*)
+ echo >&2 "No merge strategy handled the merge."
+ ;;
+ *)
+ echo >&2 "Merge with strategy $use_strategies failed."
+ ;;
+ esac
exit 2
;;
"$wt_strategy")