hgbook

diff en/examples/backout.non-tip.backout.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: 006bbad1f190
     1.1 --- a/en/examples/backout.non-tip.backout.out	Tue Mar 06 21:44:56 2007 -0800
     1.2 +++ b/en/examples/backout.non-tip.backout.out	Sat Oct 18 15:44:41 2008 -0500
     1.3 @@ -2,6 +2,7 @@
     1.4  $ \textbf{hg commit -m 'third change'}
     1.5  $ \textbf{hg backout --merge -m 'back out second change' 1}
     1.6  reverting myfile
     1.7 +created new head
     1.8  changeset  backs out changeset 
     1.9  merging with changeset 
    1.10  merging myfile
author	jerojasro@localhost
date	Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents	006bbad1f190
children