Mercurial > hgbook

diff en/examples/daily.copy.merge.out @ 391:4aa900e1de2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed sample output for 'daily.copy' test.
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed, 20 Aug 2008 21:48:38 +0200
parents 006bbad1f190
children 83790457e85b
line wrap: on
line diff
--- 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}