hgbook
view ja/examples/tour-merge-conflict.pull.out @ 1042:b08a63383d04
1.6.1 2 para translated
| author | zhaopingsun |
|---|---|
| date | Mon Nov 09 21:53:10 2009 -0500 (2009-11-09) |
| parents | |
| children |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam-cousin scam-merge}
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd scam-merge}
5 $ \textbf{hg pull -u ../scam-son}
6 pulling from ../scam-son
7 searching for changes
8 adding changesets
9 adding manifests
10 adding file changes
11 added 1 changesets with 1 changes to 1 files (+1 heads)
12 not updating, since new heads added
13 (run 'hg heads' to see heads, 'hg merge' to merge)