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

diff --cc builtin-merge.c
Simple merge