From: J. Bruce Fields <bfields@citi.umich.edu>
Date: Sun, 11 Mar 2007 02:52:39 +0000 (-0500)
Subject: user-manual: fix inconsistent use of pull and merge
X-Git-Tag: v1.5.0.4~12^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a?hp=fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a

user-manual: fix inconsistent use of pull and merge

I used "git pull ." instead of "git merge" here without any explanation.
Stick instead to "git merge" for now (the equivalent pull syntax is
still covered in a later chapter).

Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---