Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 19 Apr 2006 22:41:55 +0000 (15:41 -0700)
committerJunio 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.

Trivial merge