hgbook
annotate en/examples/tour-merge-conflict.pull.out @ 449:9b3cc9f398f9
Finished MQ chapter translation
Added translation term fold
Added translation term fold
| author | Igor TAmara <igor@tamarapatino.org> |
|---|---|
| date | Sat Dec 13 12:23:51 2008 -0500 (2008-12-13) |
| parents | 006bbad1f190 |
| children |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{cd ..} |
| bos@144 | 2 $ \textbf{hg clone scam-cousin scam-merge} |
| hg@302 | 3 updating working directory |
| bos@144 | 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| bos@144 | 5 $ \textbf{cd scam-merge} |
| bos@144 | 6 $ \textbf{hg pull -u ../scam-son} |
| bos@144 | 7 pulling from ../scam-son |
| bos@144 | 8 searching for changes |
| bos@144 | 9 adding changesets |
| bos@144 | 10 adding manifests |
| bos@144 | 11 adding file changes |
| bos@144 | 12 added 1 changesets with 1 changes to 1 files (+1 heads) |
| bos@144 | 13 not updating, since new heads added |
| bos@144 | 14 (run 'hg heads' to see heads, 'hg merge' to merge) |