hgbook
view en/examples/daily.copy.merge.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author | jerojasro@localhost |
|---|---|
| date | Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents | 4aa900e1de2b |
| children | 5ffee9123bbf |
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