1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/ja/examples/daily.copy.merge.out	Fri Sep 04 16:33:46 2009 +0200
     1.3 @@ -0,0 +1,15 @@
     1.4 +$ \textbf{hg pull ../my-copy}
     1.5 +pulling from ../my-copy
     1.6 +searching for changes
     1.7 +adding changesets
     1.8 +adding manifests
     1.9 +adding file changes
    1.10 +added 1 changesets with 1 changes to 1 files (+1 heads)
    1.11 +(run 'hg heads' to see heads, 'hg merge' to merge)
    1.12 +$ \textbf{hg merge}
    1.13 +merging file and new-file
    1.14 +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.15 +(branch merge, don't forget to commit)
    1.16 +$ \textbf{cat new-file}
    1.17 +line
    1.18 +new contents