# HG changeset patch
# User Guido Ostkamp <hg@ostkamp.fastmail.fm>
# Date 1219261718 -7200
# Node ID 4aa900e1de2b5fa03ad73132833629e4213928cd
# Parent  fe9237037e4d25d1b1ea09756177b28e15a53dae
Fixed sample output for 'daily.copy' test.

diff -r fe9237037e4d -r 4aa900e1de2b en/examples/daily.copy.clone.out
--- a/en/examples/daily.copy.clone.out	Wed Aug 20 21:46:07 2008 +0200
+++ b/en/examples/daily.copy.clone.out	Wed Aug 20 21:48:38 2008 +0200
@@ -1,3 +1,4 @@
 $ \textbf{cd ..}
 $ \textbf{hg clone my-copy your-copy}
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r fe9237037e4d -r 4aa900e1de2b en/examples/daily.copy.merge.out
--- a/en/examples/daily.copy.merge.out	Wed Aug 20 21:46:07 2008 +0200
+++ b/en/examples/daily.copy.merge.out	Wed Aug 20 21:48:38 2008 +0200
@@ -7,7 +7,7 @@
 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
+merging file and new-file to 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}