![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 17:32:40 +0000 (09:32 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 13 Dec 2006 17:33:08 +0000 (09:33 -0800) | ||
| commit | 0c4e95d083f77de03a64b65f5633ed0ba082a26e | |
| tree | 63f38b5f79a372a14d4ea5f2fa39556149781fdf | tree | snapshot |
| parent | 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 | commit | diff |
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>
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 | diff | blob | history |