hgbook

diff en/examples/tour-merge-conflict.pull.out @ 449:9b3cc9f398f9

find changesets by author, revision, files, or words in the commit message
Finished MQ chapter translation

Added translation term fold
author Igor TAmara <igor@tamarapatino.org>
date Sat Dec 13 12:23:51 2008 -0500 (2008-12-13)
parents 006bbad1f190
children
line diff
     1.1 --- a/en/examples/tour-merge-conflict.pull.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/tour-merge-conflict.pull.out	Sat Dec 13 12:23:51 2008 -0500
     1.3 @@ -1,5 +1,6 @@
     1.4  $ \textbf{cd ..}
     1.5  $ \textbf{hg clone scam-cousin scam-merge}
     1.6 +updating working directory
     1.7  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8  $ \textbf{cd scam-merge}
     1.9  $ \textbf{hg pull -u ../scam-son}