![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Sep 2005 07:12:06 +0000 (00:12 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 27 Sep 2005 01:04:17 +0000 (18:04 -0700) | ||
| commit | deca7e8c591608c9ffd0bf0aaf10b379da9f6d6e | |
| tree | 49b93d4d45cd52f4c05b1030d05b4b8329c5824a | tree | snapshot |
| parent | e2f5f6ef6795c880a2f13ea472b96704b4a4ca94 | commit | diff |
Give default merge message after failed automerge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-commit.sh | diff | blob | history | |
| git-merge.sh | diff | blob | history |