hgbook
annotate en/examples/daily.copy.merge.out @ 442:606295a87ff2
translated a bit more of hook.tex
| author | jerojasro@abu.no-ip.org |
|---|---|
| date | Mon Dec 08 12:55:51 2008 -0500 (2008-12-08) |
| parents | 4aa900e1de2b |
| children | 5ffee9123bbf |
| rev | line source |
|---|---|
| bos@144 | 1 $ \textbf{hg pull ../my-copy} |
| bos@144 | 2 pulling from ../my-copy |
| bos@144 | 3 searching for changes |
| bos@144 | 4 adding changesets |
| bos@144 | 5 adding manifests |
| bos@144 | 6 adding file changes |
| bos@144 | 7 added 1 changesets with 1 changes to 1 files (+1 heads) |
| bos@144 | 8 (run 'hg heads' to see heads, 'hg merge' to merge) |
| bos@144 | 9 $ \textbf{hg merge} |
| jerojasro@334 | 10 merging file and new-file |
| bos@144 | 11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| bos@144 | 12 (branch merge, don't forget to commit) |
| bos@144 | 13 $ \textbf{cat new-file} |
| bos@144 | 14 line |
| bos@144 | 15 new contents |