hgbook

view en/examples/daily.copy.merge.out @ 144:006bbad1f190

find changesets by author, revision, files, or words in the commit message
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:44:56 2007 -0800 (2007-03-06)
parents
children 4aa900e1de2b
line source
1 $ \textbf{hg pull ../my-copy}
2 pulling from ../my-copy
3 searching for changes
4 adding changesets
5 adding manifests
6 adding file changes
7 added 1 changesets with 1 changes to 1 files (+1 heads)
8 (run 'hg heads' to see heads, 'hg merge' to merge)
9 $ \textbf{hg merge}
10 merging file and new-file
11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
12 (branch merge, don't forget to commit)
13 $ \textbf{cat new-file}
14 line
15 new contents