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