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>
J. Bruce Fields committed
Mar 10, 2007 at 21:52 UTC
fabbd8f6ca610a570d7bfcbbfc80bb0e03247b2a
1 file changed
+3
-11
Documentation/user-manual.txt
+3
-11
@@ -1133,17 +1133,9 @@ modified in two different ways in the remote branch and the local
1133
branch--then you are warned; the output may look something like this:
1134
1135
-------------------------------------------------
1136
-$ git pull . next
1137
-Trying really trivial in-index merge...
1138
-fatal: Merge requires file-level merging
1139
-Nope.
1140
-Merging HEAD with 77976da35a11db4580b80ae27e8d65caf5208086
1141
-Merging:
1142
-15e2162 world
1143
-77976da goodbye
1144
-found 1 common ancestor(s):
1145
-d122ed4 initial
1146
-Auto-merging file.txt
1136
+$ git merge next
1137
+ 100% (4/4) done
1138
+Auto-merged file.txt
1139
CONFLICT (content): Merge conflict in file.txt
1140
Automatic merge failed; fix conflicts and then commit the result.
1141
-------------------------------------------------