hgbook
annotate en/examples/tour-merge-conflict.pull.out @ 514:db12ab3b3b25
corrected some typos on the title page.
translated a couple of index entries
translated a couple of index entries
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Sun Jan 18 19:45:33 2009 -0500 (2009-01-18) |
| 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) |