Mercurial > hgbook
view en/examples/daily.copy.merge.out @ 433:83790457e85b
modifications to generate the examples for the book
author | jerojasro@localhost |
---|---|
date | Sat, 18 Oct 2008 12:07:16 -0500 |
parents | 4aa900e1de2b |
children | 5ffee9123bbf |
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