From: Junio C Hamano <junkio@cox.net>
Date: Wed, 19 Apr 2006 22:41:55 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.0-rc1~232
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=b8950769b8b91d634ec549fd1af792ccc1864f79

Merge branch 'maint'

* maint:
  pre-commit hook: complain about conflict markers.
  git-merge: a bit more readable user guidance.
---

b8950769b8b91d634ec549fd1af792ccc1864f79