hgbook
view en/examples/daily.copy.merge.out @ 320:97e929385442
Small typos, plus a perl regexp match. It was stripping newlines!
| author | Taavi Burns <taavi@taaviburns.ca> |
|---|---|
| date | Sun Aug 31 12:14:23 2008 -0400 (2008-08-31) |
| parents | 006bbad1f190 |
| children | 83790457e85b |
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