Give default merge message after failed automerge.
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 07:12:06 +0000 (00:12 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Sep 2005 01:04:17 +0000 (18:04 -0700)
commitdeca7e8c591608c9ffd0bf0aaf10b379da9f6d6e
tree49b93d4d45cd52f4c05b1030d05b4b8329c5824a
parente2f5f6ef6795c880a2f13ea472b96704b4a4ca94
Give default merge message after failed automerge.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-commit.sh
git-merge.sh