hgbook

diff en/examples/hook.ws.simple.out @ 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 e67251ac336f
children
line diff
     1.1 --- a/en/examples/hook.ws.simple.out	Tue Mar 27 01:15:34 2007 -0500
     1.2 +++ b/en/examples/hook.ws.simple.out	Sat Oct 18 15:44:41 2008 -0500
     1.3 @@ -4,8 +4,8 @@
     1.4  $ \textbf{echo 'a ' > a}
     1.5  $ \textbf{hg commit -A -m 'test with trailing whitespace'}
     1.6  adding a
     1.7 -abort: pretxncommit.whitespace hook exited with status 1
     1.8  transaction abort!
     1.9  rollback completed
    1.10 +abort: pretxncommit.whitespace hook exited with status 1
    1.11  $ \textbf{echo 'a' > a}
    1.12  $ \textbf{hg commit -A -m 'drop trailing whitespace and try again'}