hgbook

diff en/examples/extdiff @ 336:7e52f0cc4516

changed es/hgext.tex
changed es/hook.tex
changed es/kdiff3.png
changed es/license.tex
changed es/mq-collab.tex
changed es/mq-ref.tex
changed es/mq.tex
changed es/note.png
changed es/tour-merge.tex
changed es/undo-manual-merge.dot
changed es/undo-non-tip.dot

files needed to compile the pdf version of the book.
author jerojasro@localhost
date Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
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 Oct 18 15:44:41 2008 -0500
     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: