Mercurial > hgbook
changeset 391:4aa900e1de2b
Fixed sample output for 'daily.copy' test.
| author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
|---|---|
| date | Wed, 20 Aug 2008 21:48:38 +0200 |
| parents | fe9237037e4d |
| children | 7273d06279d1 |
| files | en/examples/daily.copy.clone.out en/examples/daily.copy.merge.out |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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}