hgbook: 4432ad34b8e5 en/examples/results/branching.merge.out

hgbook

Check in example outputs with begin/end markers.

author	Bryan O'Sullivan <bos@serpentine.com>
date	Tue Mar 31 12:19:01 2009 -0700 (2009-03-31)
parents	0d5935744f87
children

line source

1

2 <screen><prompt>$</prompt> <userinput>cd ../main</userinput>

3 <prompt>$</prompt> <userinput>hg pull ../stable</userinput>

4 pulling from ../stable

5 searching for changes

6 adding changesets

7 adding manifests

8 adding file changes

9 added 1 changesets with 1 changes to 1 files (+1 heads)

10 (run 'hg heads' to see heads, 'hg merge' to merge)

11 <prompt>$</prompt> <userinput>hg merge</userinput>

12 merging myfile

13 0 files updated, 1 files merged, 0 files removed, 0 files unresolved

14 (branch merge, don't forget to commit)

15 <prompt>$</prompt> <userinput>hg commit -m 'Bring in bugfix from stable branch'</userinput>

16 <prompt>$</prompt> <userinput>cat myfile</userinput>

17 This is a fix to a boring feature.

18 This is exciting and new!

19 </screen>

20