# HG changeset patch
# User Guido Ostkamp <hg@ostkamp.fastmail.fm>
# Date 1219262904 -7200
# Node ID 1b52bda675d03cdec19974bc0f0a4ccf15b0e138
# Parent  ef34f7bec74959b5825bd3bede975521edeb0ba6
Fix sample output for 'tour' test.

diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.clone-pull.out
--- a/en/examples/tour.clone-pull.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.clone-pull.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,3 +1,4 @@
 $ \textbf{cd ..}
 $ \textbf{hg clone hello hello-pull}
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.clone-push.out
--- a/en/examples/tour.clone-push.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.clone-push.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,3 +1,4 @@
 $ \textbf{cd ..}
 $ \textbf{hg clone hello hello-push}
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.clone.out
--- a/en/examples/tour.clone.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.clone.out	Wed Aug 20 22:08:24 2008 +0200
@@ -5,4 +5,5 @@
 adding manifests
 adding file changes
 added 5 changesets with 5 changes to 2 files
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.diff.out
--- a/en/examples/tour.diff.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.diff.out	Wed Aug 20 22:08:24 2008 +0200
@@ -2,7 +2,7 @@
 diff -r  hello.c
 
 
-@@ -8,5 +8,6 @@ int main(int argc, char **argv)
+@@ -8,5 +8,6 @@
  int main(int argc, char **argv)
  \{
  	printf("hello, world!\textbackslash{}");
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.help.out
--- a/en/examples/tour.help.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.help.out	Wed Aug 20 22:08:24 2008 +0200
@@ -3,7 +3,7 @@
 
 create a new repository in the given directory
 
-    Initialize a new repository in the given directory.  If the given
+    Initialize a new repository in the given directory. If the given
     directory does not exist, it is created.
 
     If no directory is given, the current directory is used.
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.merge.clone.out
--- a/en/examples/tour.merge.clone.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.merge.clone.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,5 +1,6 @@
 $ \textbf{cd ..}
 $ \textbf{hg clone hello my-new-hello}
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{cd my-new-hello}
 $ \textbf{sed -i '/printf/i\textbackslash{}\textbackslash{}tprintf("once more, hello.\textbackslash{}\textbackslash{}n");' hello.c}
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.merge.update.out
--- a/en/examples/tour.merge.update.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.merge.update.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,2 +1,2 @@
 $ \textbf{hg update}
-abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes
+abort: crosses branches (use 'hg merge' or 'hg update -C')
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.reclone.out
--- a/en/examples/tour.reclone.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.reclone.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,4 +1,5 @@
 $ \textbf{cd ..}
 $ \textbf{hg clone hello my-hello}
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{cd my-hello}
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.tip.out
--- a/en/examples/tour.tip.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.tip.out	Wed Aug 20 22:08:24 2008 +0200
@@ -11,7 +11,7 @@
 diff -r  -r  hello.c
 
 
-@@ -8,5 +8,6 @@ int main(int argc, char **argv)
+@@ -8,5 +8,6 @@
  int main(int argc, char **argv)
  \{
  	printf("hello, world!\textbackslash{}");
diff -r ef34f7bec749 -r 1b52bda675d0 en/examples/tour.version.out
--- a/en/examples/tour.version.out	Wed Aug 20 22:04:41 2008 +0200
+++ b/en/examples/tour.version.out	Wed Aug 20 22:08:24 2008 +0200
@@ -1,6 +1,6 @@
 $ \textbf{hg version}
 Mercurial Distributed SCM (version )
 
-Copyright (C) 2005-2007 Matt Mackall <mpm@selenic.com> and others
+Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.