hgbook
view en/examples/tour-merge-conflict.pull.out @ 940:1dc7475ccab1
Work in progress on tour-basic
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Mon Feb 16 18:24:25 2009 +0100 (2009-02-16) |
| parents | 006bbad1f190 |
| children |
line source
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)