hgbook

diff en/examples/template.simple @ 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 b476081a9c04
children
line diff
     1.1 --- a/en/examples/template.simple	Tue Oct 03 13:03:42 2006 -0700
     1.2 +++ b/en/examples/template.simple	Wed Aug 20 22:00:46 2008 +0200
     1.3 @@ -1,5 +1,9 @@
     1.4  #!/bin/bash
     1.5  
     1.6 +# So many different bits of random output, it would be a nightmare to
     1.7 +# ignore each individually.
     1.8 +#$ ignore: .*
     1.9 +
    1.10  hg init myrepo
    1.11  cd myrepo
    1.12  echo hello > hello