hgbook

diff en/examples/extdiff @ 1113:613690ad6a9c

find changesets by author, revision, files, or words in the commit message
Merge with dongsheng
author Bryan O'Sullivan <bos@serpentine.com>
date Sat Jul 10 16:21:26 2010 +0100 (2010-07-10)
parents eef2171243e8
children
line diff
     1.1 --- a/en/examples/extdiff	Sat May 26 11:52:18 2007 -0700
     1.2 +++ b/en/examples/extdiff	Sat Jul 10 16:21:26 2010 +0100
     1.3 @@ -19,6 +19,8 @@
     1.4  
     1.5  #$ name: extdiff-ctx
     1.6  
     1.7 +#$ ignore: ^\*\*\* a.*
     1.8 +
     1.9  hg extdiff -o -NprcC5
    1.10  
    1.11  #$ name: