1.1 --- a/en/examples/backout.manual.log.out	Thu Jan 29 22:30:48 2009 -0800
     1.2 +++ b/en/examples/backout.manual.log.out	Thu Jan 29 22:46:56 2009 -0800
     1.3 @@ -1,13 +1,13 @@
     1.4  $ \textbf{hg log --style compact}
     1.5 -3[tip]:1      2009-01-30 06:29 +0000   bos
     1.6 +3[tip]:1      2009-01-30 06:32 +0000   bos
     1.7    back out second change
     1.8  
     1.9 -2      2009-01-30 06:29 +0000   bos
    1.10 +2      2009-01-30 06:32 +0000   bos
    1.11    third change
    1.12  
    1.13 -1      2009-01-30 06:29 +0000   bos
    1.14 +1      2009-01-30 06:32 +0000   bos
    1.15    second change
    1.16  
    1.17 -0      2009-01-30 06:29 +0000   bos
    1.18 +0      2009-01-30 06:32 +0000   bos
    1.19    first change
    1.20  

     2.1 --- a/en/examples/backout.simple.log.out	Thu Jan 29 22:30:48 2009 -0800
     2.2 +++ b/en/examples/backout.simple.log.out	Thu Jan 29 22:46:56 2009 -0800
     2.3 @@ -1,10 +1,10 @@
     2.4  $ \textbf{hg log --style compact}
     2.5 -2[tip]      2009-01-30 06:29 +0000   bos
     2.6 +2[tip]      2009-01-30 06:32 +0000   bos
     2.7    back out second change
     2.8  
     2.9 -1      2009-01-30 06:29 +0000   bos
    2.10 +1      2009-01-30 06:32 +0000   bos
    2.11    second change
    2.12  
    2.13 -0      2009-01-30 06:29 +0000   bos
    2.14 +0      2009-01-30 06:32 +0000   bos
    2.15    first change
    2.16  

     3.1 --- a/en/examples/daily.copy.merge.out	Thu Jan 29 22:30:48 2009 -0800
     3.2 +++ b/en/examples/daily.copy.merge.out	Thu Jan 29 22:46:56 2009 -0800
     3.3 @@ -7,7 +7,7 @@
     3.4  added 1 changesets with 1 changes to 1 files (+1 heads)
     3.5  (run 'hg heads' to see heads, 'hg merge' to merge)
     3.6  $ \textbf{hg merge}
     3.7 -merging file and new-file
     3.8 +merging file and new-file to new-file
     3.9  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    3.10  (branch merge, don't forget to commit)
    3.11  $ \textbf{cat new-file}

     4.1 --- a/en/examples/mq.guards.qselect.foo.out	Thu Jan 29 22:30:48 2009 -0800
     4.2 +++ b/en/examples/mq.guards.qselect.foo.out	Thu Jan 29 22:46:56 2009 -0800
     4.3 @@ -1,5 +1,5 @@
     4.4  $ \textbf{hg qpop -a}
     4.5 -Patch queue now empty
     4.6 +patch queue now empty
     4.7  $ \textbf{hg qselect}
     4.8  no active guards
     4.9  $ \textbf{hg qselect foo}

     5.1 --- a/en/examples/mq.guards.qselect.foobar.out	Thu Jan 29 22:30:48 2009 -0800
     5.2 +++ b/en/examples/mq.guards.qselect.foobar.out	Thu Jan 29 22:46:56 2009 -0800
     5.3 @@ -5,4 +5,4 @@
     5.4  $ \textbf{hg qpush -a}
     5.5  applying hello.patch
     5.6  applying goodbye.patch
     5.7 -Now at: goodbye.patch
     5.8 +now at: goodbye.patch

     6.1 --- a/en/examples/mq.guards.qselect.qpush.out	Thu Jan 29 22:30:48 2009 -0800
     6.2 +++ b/en/examples/mq.guards.qselect.qpush.out	Thu Jan 29 22:46:56 2009 -0800
     6.3 @@ -1,4 +1,4 @@
     6.4  $ \textbf{hg qpush -a}
     6.5  applying hello.patch
     6.6  applying goodbye.patch
     6.7 -Now at: goodbye.patch
     6.8 +now at: goodbye.patch

     7.1 --- a/en/examples/mq.guards.qselect.quux.out	Thu Jan 29 22:30:48 2009 -0800
     7.2 +++ b/en/examples/mq.guards.qselect.quux.out	Thu Jan 29 22:46:56 2009 -0800
     7.3 @@ -1,6 +1,6 @@
     7.4  $ \textbf{hg qselect quux}
     7.5  number of guarded, applied patches has changed from 0 to 2
     7.6  $ \textbf{hg qpop -a}
     7.7 -Patch queue now empty
     7.8 +patch queue now empty
     7.9  $ \textbf{hg qpush -a}
    7.10  patch series already fully applied

     8.1 --- a/en/examples/mq.tarball.newsource.out	Thu Jan 29 22:30:48 2009 -0800
     8.2 +++ b/en/examples/mq.tarball.newsource.out	Thu Jan 29 22:46:56 2009 -0800
     8.3 @@ -1,5 +1,5 @@
     8.4  $ \textbf{hg qpop -a}
     8.5 -Patch queue now empty
     8.6 +patch queue now empty
     8.7  $ \textbf{cd ..}
     8.8  $ \textbf{download netplug-1.2.8.tar.bz2}
     8.9  $ \textbf{hg clone netplug-1.2.5 netplug-1.2.8}

     9.1 --- a/en/examples/mq.tarball.repush.out	Thu Jan 29 22:30:48 2009 -0800
     9.2 +++ b/en/examples/mq.tarball.repush.out	Thu Jan 29 22:46:56 2009 -0800
     9.3 @@ -10,4 +10,4 @@
     9.4  $ \textbf{hg qpush -a}
     9.5  (working directory not at tip)
     9.6  applying build-fix.patch
     9.7 -Now at: build-fix.patch
     9.8 +now at: build-fix.patch

    10.1 --- a/en/examples/mq.tutorial.qnew2.out	Thu Jan 29 22:30:48 2009 -0800
    10.2 +++ b/en/examples/mq.tutorial.qnew2.out	Thu Jan 29 22:46:56 2009 -0800
    10.3 @@ -1,15 +1,15 @@
    10.4  $ \textbf{hg qnew second.patch}
    10.5  $ \textbf{hg log --style=compact --limit=2}
    10.6 -2[qtip,second.patch,tip]   
    10.7 +2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
    10.8    [mq]: second.patch
    10.9  
   10.10 -1[first.patch,qbase]   
   10.11 +1[first.patch,qbase]      2009-01-30 06:34 +0000   bos
   10.12    [mq]: first.patch
   10.13  
   10.14  $ \textbf{echo 'line 4' >> file1}
   10.15  $ \textbf{hg qrefresh}
   10.16  $ \textbf{hg tip --style=compact --patch}
   10.17 -2[qtip,second.patch,tip]   
   10.18 +2[qtip,second.patch,tip]      2009-01-30 06:34 +0000   bos
   10.19    [mq]: second.patch
   10.20  
   10.21  diff -r  -r  file1

    11.1 --- a/en/examples/mq.tutorial.qpop.out	Thu Jan 29 22:30:48 2009 -0800
    11.2 +++ b/en/examples/mq.tutorial.qpop.out	Thu Jan 29 22:46:56 2009 -0800
    11.3 @@ -2,7 +2,7 @@
    11.4  first.patch
    11.5  second.patch
    11.6  $ \textbf{hg qpop}
    11.7 -Now at: first.patch
    11.8 +now at: first.patch
    11.9  $ \textbf{hg qseries}
   11.10  first.patch
   11.11  second.patch

    12.1 --- a/en/examples/mq.tutorial.qpush-a.out	Thu Jan 29 22:30:48 2009 -0800
    12.2 +++ b/en/examples/mq.tutorial.qpush-a.out	Thu Jan 29 22:46:56 2009 -0800
    12.3 @@ -1,6 +1,6 @@
    12.4  $ \textbf{hg qpush -a}
    12.5  applying second.patch
    12.6 -Now at: second.patch
    12.7 +now at: second.patch
    12.8  $ \textbf{cat file1}
    12.9  line 1
   12.10  line 2

    13.1 --- a/en/examples/mq.tutorial.qrefresh.out	Thu Jan 29 22:30:48 2009 -0800
    13.2 +++ b/en/examples/mq.tutorial.qrefresh.out	Thu Jan 29 22:46:56 2009 -0800
    13.3 @@ -9,7 +9,7 @@
    13.4  $ \textbf{hg qrefresh}
    13.5  $ \textbf{hg diff}
    13.6  $ \textbf{hg tip --style=compact --patch}
    13.7 -1[qtip,first.patch,tip,qbase]   
    13.8 +1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
    13.9    [mq]: first.patch
   13.10  
   13.11  diff -r  -r  file1

    14.1 --- a/en/examples/mq.tutorial.qrefresh2.out	Thu Jan 29 22:30:48 2009 -0800
    14.2 +++ b/en/examples/mq.tutorial.qrefresh2.out	Thu Jan 29 22:46:56 2009 -0800
    14.3 @@ -3,7 +3,7 @@
    14.4  M file1
    14.5  $ \textbf{hg qrefresh}
    14.6  $ \textbf{hg tip --style=compact --patch}
    14.7 -1[qtip,first.patch,tip,qbase]   
    14.8 +1[qtip,first.patch,tip,qbase]      2009-01-30 06:34 +0000   bos
    14.9    [mq]: first.patch
   14.10  
   14.11  diff -r  -r  file1

    15.1 --- a/en/examples/template.svnstyle	Thu Jan 29 22:30:48 2009 -0800
    15.2 +++ b/en/examples/template.svnstyle	Thu Jan 29 22:46:56 2009 -0800
    15.3 @@ -34,6 +34,7 @@
    15.4  hg log -r0 --template '{node}'
    15.5  
    15.6  #$ name: simplest
    15.7 +#$ ignore: \d+-\d+-\d+ \d+:\d+ \+.*
    15.8  
    15.9  cat svn.style
   15.10  hg log -r1 --style svn.style

    16.1 --- a/en/examples/template.svnstyle.result.out	Thu Jan 29 22:30:48 2009 -0800
    16.2 +++ b/en/examples/template.svnstyle.result.out	Thu Jan 29 22:46:56 2009 -0800
    16.3 @@ -1,7 +1,7 @@
    16.4  $ \textbf{hg log -r1 --style svn.style}
    16.5  ------------------------------------------------------------------------
    16.6  
    16.7 -r1 | bos 
    16.8 +r1 | bos | 2009-01-30 06:40 +0000 (Fri, 30 Jan 2009 06:40:17 +0000)
    16.9  
   16.10  added line to end of <<hello>> file.
   16.11  

    17.1 --- a/en/examples/tour.help.out	Thu Jan 29 22:30:48 2009 -0800
    17.2 +++ b/en/examples/tour.help.out	Thu Jan 29 22:46:56 2009 -0800
    17.3 @@ -3,14 +3,13 @@
    17.4  
    17.5  create a new repository in the given directory
    17.6  
    17.7 -    Initialize a new repository in the given directory.  If the given
    17.8 +    Initialize a new repository in the given directory. If the given
    17.9      directory does not exist, it is created.
   17.10  
   17.11      If no directory is given, the current directory is used.
   17.12  
   17.13      It is possible to specify an ssh:// URL as the destination.
   17.14 -    Look at the help text for the pull command for important details
   17.15 -    about ssh:// URLs.
   17.16 +    See 'hg help urls' for more information.
   17.17  
   17.18  options:
   17.19  

    18.1 --- a/en/examples/tour.version.out	Thu Jan 29 22:30:48 2009 -0800
    18.2 +++ b/en/examples/tour.version.out	Thu Jan 29 22:46:56 2009 -0800
    18.3 @@ -1,5 +1,5 @@
    18.4  $ \textbf{hg version}
    18.5 -Mercurial Distributed SCM (version 1.0)
    18.6 +Mercurial Distributed SCM (version )
    18.7  
    18.8  Copyright (C) 2005-2008 Matt Mackall <mpm@selenic.com> and others
    18.9  This is free software; see the source for copying conditions. There is NO