Merge branch 'jc/commit-careful'

diff --git a/git-merge.sh b/git-merge.sh
index a948878b911f56a3d6ace784d5a93952ce25c64b..2f3d936b9c901bb1bebca3cdb34113a4f1f87b01 100755 (executable)
--- 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")