Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git merge: reword failure message.
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)
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>
raw
|
patch
| inline |
side by side
(from:
0c4e95d
)
No differences found