diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-30 02:38:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 02:38:24 -0800 |
| commit | 0501c2409d7661d2b13f094136d246b9b5b8acf9 (patch) | |
| tree | fecc1f4220d1e79fe623644e9f2b9456f185c684 /Documentation/tutorial.txt | |
| parent | 58cce8a85da745e20c9527c569a0e0935ff3ab30 (diff) | |
| download | git-0501c2409d7661d2b13f094136d246b9b5b8acf9.tar.gz git-0501c2409d7661d2b13f094136d246b9b5b8acf9.tar.xz | |
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>
Diffstat (limited to 'Documentation/tutorial.txt')
| -rw-r--r-- | Documentation/tutorial.txt | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index e2dfb00ab..cf7ba76dd 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 ------------------------------------------------ |