X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Ftutorial.txt;fp=Documentation%2Ftutorial.txt;h=cf7ba76ddfb76b4e92b71474a3386d0573820ac5;hb=0501c2409d7661d2b13f094136d246b9b5b8acf9;hp=e2dfb00ab10de601204715e4b244420a0a2cb7c8;hpb=58cce8a85da745e20c9527c569a0e0935ff3ab30;p=git.git

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index e2dfb00a..cf7ba76d 100644
--- 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.
 	...
-	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
 ----------------
 
@@ -942,10 +941,10 @@ environment, is `git show-branch`.
 
 ------------------------------------------------
 $ git show-branch master mybranch
-* [master] Merged "mybranch" changes.
+* [master] Merge work in mybranch
  ! [mybranch] Some work.
 --
-+  [master] Merged "mybranch" changes.
++  [master] Merge work in mybranch
 ++ [mybranch] Some work.
 ------------------------------------------------
 
@@ -998,10 +997,10 @@ looks like, or run `show-branch`, which tells you this.
 
 ------------------------------------------------
 $ 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
 ------------------------------------------------