![[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) | ||
| commit | b8950769b8b91d634ec549fd1af792ccc1864f79 | |
| tree | 9c1f18332894c18f404932ad11be32d401fbe5eb | tree | snapshot |
| parent | ba580aeafb52921025de1efe1c50db34393f9907 | commit | diff |
| parent | 61c2bcbd11e3b66a328b3850c01592e5dc1c67bb | commit | diff |
Merge branch 'maint'
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.
* maint:
pre-commit hook: complain about conflict markers.
git-merge: a bit more readable user guidance.