view ja/examples/daily.copy.merge.out @ 776:019040fbf5f5

merged to upstream: phase 1

$ \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