hgbook

diff en/examples/tour-merge-conflict.cousin.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author Guido Ostkamp <hg@ostkamp.fastmail.fm>
date Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
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	Wed Aug 20 22:00:46 2008 +0200
     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}