From: Sergei Organov <osv@javad.com>
Date: Tue, 30 Oct 2007 19:54:02 +0000 (+0300)
Subject: core-tutorial: Use new syntax for git-merge.
X-Git-Tag: v1.5.3.5~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba17892ddc85c0ffe8fecd600c29cb38ec7e5587?hp=ba17892ddc85c0ffe8fecd600c29cb38ec7e5587

core-tutorial: Use new syntax for git-merge.

"git-merge <msg> HEAD <other branches>" is still supported but
we shouldn't encourage its use.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---