hgbook

view en/examples/results/tour-merge-conflict.pull.out @ 648:e0ac2341a861

Fix building error introduced by bos at rev 8366882f67f2
author Dongsheng Song <dongsheng.song@gmail.com>
date Wed Mar 18 21:50:57 2009 +0800 (2009-03-18)
parents 44d1363234d2
children 4432ad34b8e5
line source
1 <screen><prompt>$</prompt> <userinput>cd ..</userinput>
2 <prompt>$</prompt> <userinput>hg clone scam-cousin scam-merge</userinput>
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 <prompt>$</prompt> <userinput>cd scam-merge</userinput>
6 <prompt>$</prompt> <userinput>hg pull -u ../scam-son</userinput>
7 pulling from ../scam-son
8 searching for changes
9 adding changesets
10 adding manifests
11 adding file changes
12 added 1 changesets with 1 changes to 1 files (+1 heads)
13 not updating, since new heads added
14 (run 'hg heads' to see heads, 'hg merge' to merge)
15 </screen>