![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 22:41:55 +0000 (15:41 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 19 Apr 2006 22:41:55 +0000 (15:41 -0700) |
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
Trivial merge