hgbook

diff en/examples/tour-merge-conflict.cousin.out @ 931:9968b0ed4a38

find changesets by author, revision, files, or words in the commit message
First load of translation in the tour-basic
author Romain PELISSE <romain.pelisse@atosorigin.com>
date Sun Feb 08 23:39:21 2009 +0100 (2009-02-08)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/tour-merge-conflict.cousin.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict.cousin.out	Sun Feb 08 23:39:21 2009 +0100
     1.3 @@ -1,5 +1,6 @@
     1.4  $ \textbf{cd ..}
     1.5  $ \textbf{hg clone scam scam-cousin}
     1.6 +updating working directory
     1.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8  $ \textbf{cd scam-cousin}
     1.9  $ \textbf{cat > letter.txt <<EOF}