Skip to content

Commit

Permalink
git merge: reword failure message.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Dec 13, 2006
1 parent 8371234 commit 0c4e95d
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 0c4e95d

Please sign in to comment.