hgbook
annotate ja/examples/daily.copy.merge.out @ 977:719b03ea27c8
merge with Italian, and very (few) work on ch03
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Fri Sep 04 16:33:46 2009 +0200 (2009-09-04) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{hg pull ../my-copy} |
| foozy@708 | 2 pulling from ../my-copy |
| foozy@708 | 3 searching for changes |
| foozy@708 | 4 adding changesets |
| foozy@708 | 5 adding manifests |
| foozy@708 | 6 adding file changes |
| foozy@708 | 7 added 1 changesets with 1 changes to 1 files (+1 heads) |
| foozy@708 | 8 (run 'hg heads' to see heads, 'hg merge' to merge) |
| foozy@708 | 9 $ \textbf{hg merge} |
| foozy@708 | 10 merging file and new-file |
| foozy@708 | 11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 12 (branch merge, don't forget to commit) |
| foozy@708 | 13 $ \textbf{cat new-file} |
| foozy@708 | 14 line |
| foozy@708 | 15 new contents |