From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 Dec 2009 18:30:12 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc1~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0748494e866041034605aaf177f29a61bdc25951;p=git.git

Merge branch 'maint'

* maint:
  Prepare for 1.6.5.4
  merge: do not add standard message when message is given with -m option
  Do not misidentify "git merge foo HEAD" as an old-style invocation

Conflicts:
	RelNotes
---

0748494e866041034605aaf177f29a61bdc25951