merge: match the help text with the documentation
authorJared Hance <jaredhance@gmail.com>
Thu, 10 Feb 2011 23:52:41 +0000 (18:52 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Mar 2011 07:09:51 +0000 (00:09 -0700)
We used to be very casual in terminology and used <branch>, <ref> and
<rev> more or less interchangeably with <commit>. Match the help text
given by "git merge -h" with that of the documentation.

Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found