hgbook

changeset 292:4aa900e1de2b

Fixed sample output for 'daily.copy' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 21:48:38 2008 +0200 (2008-08-20)
parents fe9237037e4d
children 7273d06279d1
files en/examples/daily.copy.clone.out en/examples/daily.copy.merge.out
line diff
     1.1 --- a/en/examples/daily.copy.clone.out	Wed Aug 20 21:46:07 2008 +0200
     1.2 +++ b/en/examples/daily.copy.clone.out	Wed Aug 20 21:48:38 2008 +0200
     1.3 @@ -1,3 +1,4 @@
     1.4  $ \textbf{cd ..}
     1.5  $ \textbf{hg clone my-copy your-copy}
     1.6 +updating working directory
     1.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     2.1 --- a/en/examples/daily.copy.merge.out	Wed Aug 20 21:46:07 2008 +0200
     2.2 +++ b/en/examples/daily.copy.merge.out	Wed Aug 20 21:48:38 2008 +0200
     2.3 @@ -7,7 +7,7 @@
     2.4  added 1 changesets with 1 changes to 1 files (+1 heads)
     2.5  (run 'hg heads' to see heads, 'hg merge' to merge)
     2.6  $ \textbf{hg merge}
     2.7 -merging file and new-file
     2.8 +merging file and new-file to new-file
     2.9  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    2.10  (branch merge, don't forget to commit)
    2.11  $ \textbf{cat new-file}