hgbook: 4432ad34b8e5 en/examples/results/tour-merge-conflict.pull.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 ..</userinput>

3 <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>

4 updating working directory

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

6 <prompt>$</prompt> <userinput>cd scam-merge</userinput>

7 <prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>

8 pulling from ../scam-son

9 searching for changes

10 adding changesets

11 adding manifests

12 adding file changes

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

14 not updating, since new heads added

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

16 </screen>

17