hgbook

diff en/examples/daily.copy.merge.out @ 306:1b52bda675d0

find changesets by author, revision, files, or words in the commit message
Fix sample output for 'tour' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:08:24 2008 +0200 (2008-08-20)
parents 006bbad1f190
children 83790457e85b
line diff
     1.1 --- a/en/examples/daily.copy.merge.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/daily.copy.merge.out	Wed Aug 20 22:08:24 2008 +0200
     1.3 @@ -7,7 +7,7 @@
     1.4  added 1 changesets with 1 changes to 1 files (+1 heads)
     1.5  (run 'hg heads' to see heads, 'hg merge' to merge)
     1.6  $ \textbf{hg merge}
     1.7 -merging file and new-file
     1.8 +merging file and new-file to new-file
     1.9  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
    1.10  (branch merge, don't forget to commit)
    1.11  $ \textbf{cat new-file}