Mercurial > hgbook
comparison en/examples/results/tour-merge-conflict.pull.out @ 662:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon, 09 Mar 2009 21:37:47 -0700 |
parents | en/examples/tour-merge-conflict.pull.out@e281bd9a8e47 |
children | 0d5935744f87 |
comparison
equal
deleted
inserted
replaced
661:f916a8c80554 | 662:44d1363234d2 |
---|---|
1 $ \textbf{cd ..} | |
2 $ \textbf{hg clone scam-cousin scam-merge} | |
3 updating working directory | |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
5 $ \textbf{cd scam-merge} | |
6 $ \textbf{hg pull -u ../scam-son} | |
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) |