hgbook
view en/examples/daily.copy.merge.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
| parents | 83790457e85b |
| children |
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 to 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