hgbook

diff en/examples/tour-merge-conflict @ 273:00f69e8825c5

find changesets by author, revision, files, or words in the commit message
Bring book up to date with recent changes.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Nov 26 12:24:53 2007 -0800 (2007-11-26)
parents 5b80c922ebdd
children e281bd9a8e47
line diff
     1.1 --- a/en/examples/tour-merge-conflict	Thu Oct 19 15:18:07 2006 -0700
     1.2 +++ b/en/examples/tour-merge-conflict	Mon Nov 26 12:24:53 2007 -0800
     1.3 @@ -53,6 +53,7 @@
     1.4  hg pull -u ../scam-son
     1.5  
     1.6  #$ name: merge
     1.7 +#$ ignore: [<>]{7} /tmp/.*
     1.8  
     1.9  export HGMERGE=merge
    1.10  hg merge