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)
commit0c4e95d...83f77de03a64b65f5633ed0ba082a26e
tree63f38b5...79a372a14d4ea5f2fa39556149781fdfcopy hash to clipboard (tree)
parent8371234...caaf6e14fe3f2082a855eff1bbd79ae9copy hash to clipboard (diff)
git-merge.sh