hgbook
diff en/examples/results/tour-merge-conflict.pull.out @ 563:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
parents | en/examples/tour-merge-conflict.pull.out@e281bd9a8e47 |
children | 0d5935744f87 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/results/tour-merge-conflict.pull.out Mon Mar 09 21:37:47 2009 -0700 1.3 @@ -0,0 +1,14 @@ 1.4 +$ \textbf{cd ..} 1.5 +$ \textbf{hg clone scam-cousin scam-merge} 1.6 +updating working directory 1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.8 +$ \textbf{cd scam-merge} 1.9 +$ \textbf{hg pull -u ../scam-son} 1.10 +pulling from ../scam-son 1.11 +searching for changes 1.12 +adding changesets 1.13 +adding manifests 1.14 +adding file changes 1.15 +added 1 changesets with 1 changes to 1 files (+1 heads) 1.16 +not updating, since new heads added 1.17 +(run 'hg heads' to see heads, 'hg merge' to merge)