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>
Junio C Hamano committed
Dec 13, 2006 at 09:32 UTC
0c4e95d083f77de03a64b65f5633ed0ba082a26e
1 file changed
+8
-1
git-merge.sh
+8
-1
@@ -400,7 +400,14 @@ fi
400
case "$best_strategy" in
401
'')
402
restorestate
403
- echo >&2 "No merge strategy handled the merge."
403
+ case "$use_strategies" in
404
+ ?*' '?*)
405
+ echo >&2 "No merge strategy handled the merge."
406
+ ;;
407
+ *)
408
+ echo >&2 "Merge with strategy $use_strategies failed."
409
+ ;;
410
+ esac
411
exit 2
412
;;
413
"$wt_strategy")