hgbook

annotate 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
rev   line source
bos@144 1 $ \textbf{cat myfile}
bos@144 2 first change
hg@296 3 second change
hg@296 4 third change