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>
This commit is contained in:
Junio C Hamano 2006-12-13 09:32:40 -08:00
Родитель 8371234eca
Коммит 0c4e95d083
1 изменённых файлов: 8 добавлений и 1 удалений

Просмотреть файл

@ -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")