projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8371234) | patch
git merge: reword failure message.
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:32:40 +0000 (09:32 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 17:33:08 +0000 (09:33 -0800)
commit0c4e95d083f77de03a64b65f5633ed0ba082a26e
tree63f38b5f79a372a14d4ea5f2fa39556149781fdftree | snapshot
parent8371234ecaaf6e14fe3f2082a855eff1bbd79ae9commit | 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>
git-merge.sh diff | blob | history
Git—the stupid content tracker