hgbook

diff en/examples/backout.manual.cat.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/backout.manual.cat.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/backout.manual.cat.out	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -1,2 +1,4 @@
     1.4  $ \textbf{cat myfile}
     1.5  first change
     1.6 +second change
     1.7 +third change