Documentation/merge-strategies: avoid hyphenated commands
commit3c3e6f5645c5e661bc8c338e4e7a9252a14e429e
authorRamkumar Ramachandra <artagnon@gmail.com>
Sun, 16 Mar 2014 22:54:56 +0000 (16 18:54 -0400)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Mar 2014 22:13:46 +0000 (17 15:13 -0700)
treedcabd7b823e70f7564e7309ee9a5cb4934ac7c7a
parent7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d
Documentation/merge-strategies: avoid hyphenated commands

Replace git-pull and git-merge with the corresponding un-hyphenated
versions. While at it, use ` to mark it up instead of '.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/merge-strategies.txt