@matheusbsbs / matheus-bagliano / commits / 0501c2409d
Fork 0

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>

Junio C Hamano committed Nov 30, 2005 at 02:38 UTC 0501c2409d7661d2b13f094136d246b9b5b8acf9
1 file changed +6 -8
[master] Merge work in mybranch renamed
+6 -8
@@ -898,9 +898,8 @@ file, which had no differences in the `mybranch` branch), and say:
898 fatal: Merge requires file-level merging
899 Nope.
900 ...
901 - merge: warning: conflicts during merge
902 - ERROR: Merge conflict in hello.
903 - fatal: merge program failed
901 + Auto-merging hello
902 + CONFLICT (content): Merge conflict in hello
903 Automatic merge failed/prevented; fix up by hand
904 ----------------
905
@@ -942,10 +941,10 @@ environment, is `git show-branch`.
941
942 ------------------------------------------------
943 $ git show-branch master mybranch
945 -* [master] Merged "mybranch" changes.
944 +* [master] Merge work in mybranch
945 ! [mybranch] Some work.
946 --
948 -+ [master] Merged "mybranch" changes.
947 ++ [master] Merge work in mybranch
948 ++ [mybranch] Some work.
949 ------------------------------------------------
950
@@ -998,10 +997,10 @@ looks like, or run `show-branch`, which tells you this.
997
998 ------------------------------------------------
999 $ git show-branch master mybranch
1001 -! [master] Merged "mybranch" changes.
1002 - * [mybranch] Merged "mybranch" changes.
1000 +! [master] Merge work in mybranch
1001 + * [mybranch] Merge work in mybranch
1002 --
1004 -++ [master] Merged "mybranch" changes.
1003 ------------------------------------------------
1004
1005