Tutorial: adjust merge example to recursive strategy.

Current default, merge-recursive, gives slightly different
message while working from merge-resolve which was used to
prepare the illustration in the tutorial.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index e2dfb00ab10de601204715e4b244420a0a2cb7c8..cf7ba76ddfb76b4e92b71474a3386d0573820ac5 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -898,9 +898,8 @@ file, which had no differences in the `mybranch` branch), and say:
        fatal: Merge requires file-level merging
        Nope.
        ...
        fatal: Merge requires file-level merging
        Nope.
        ...

-       merge: warning: conflicts during merge
-       ERROR: Merge conflict in hello.
-       fatal: merge program failed
+       Auto-merging hello 
+       CONFLICT (content): Merge conflict in hello 

        Automatic merge failed/prevented; fix up by hand
 ----------------
 
        Automatic merge failed/prevented; fix up by hand
 ----------------
 


@@ -942,10 +941,10 @@ environment, is `git show-branch`.
 
 ------------------------------------------------
 $ git show-branch master mybranch
 
 ------------------------------------------------
 $ git show-branch master mybranch

-* [master] Merged "mybranch" changes.
+* [master] Merge work in mybranch

  ! [mybranch] Some work.
 --
  ! [mybranch] Some work.
 --

-+  [master] Merged "mybranch" changes.
++  [master] Merge work in mybranch

 ++ [mybranch] Some work.
 ------------------------------------------------
 
 ++ [mybranch] Some work.
 ------------------------------------------------
 


@@ -998,10 +997,10 @@ looks like, or run `show-branch`, which tells you this.
 
 ------------------------------------------------
 $ git show-branch master mybranch
 
 ------------------------------------------------
 $ git show-branch master mybranch

-! [master] Merged "mybranch" changes.
- * [mybranch] Merged "mybranch" changes.
+! [master] Merge work in mybranch
+ * [mybranch] Merge work in mybranch

 --
 --

-++ [master] Merged "mybranch" changes.
+++ [master] Merge work in mybranch

 ------------------------------------------------
 
 
 ------------------------------------------------