Mercurial > hgbook
view en/examples/daily.copy.merge.out @ 373:250ae1785828
finished collab.tex
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Wed, 17 Dec 2008 20:17:55 +0900 |
parents | 006bbad1f190 |
children | 4aa900e1de2b |
line wrap: on
line source
$ \textbf{hg pull ../my-copy} pulling from ../my-copy searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) $ \textbf{hg merge} merging file and new-file 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ \textbf{cat new-file} line new contents