git merge: reword failure message.
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:32:40 +0000 (09:32 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:33:08 +0000 (09:33 -0800)
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>
git-merge.sh

index a948878b911f56a3d6ace784d5a93952ce25c64b..2f3d936b9c901bb1bebca3cdb34113a4f1f87b01 100755 (executable)
@@ -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")