hgbook

diff en/examples/rename.divergent.clone.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: 91a936be78b8
     1.1 --- a/en/examples/rename.divergent.clone.out	Mon Mar 12 23:11:26 2007 -0700
     1.2 +++ b/en/examples/rename.divergent.clone.out	Sat Oct 18 15:44:41 2008 -0500
     1.3 @@ -1,4 +1,6 @@
     1.4  $ \textbf{hg clone orig anne}
     1.5 +updating working directory
     1.6  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.7  $ \textbf{hg clone orig bob}
     1.8 +updating working directory
     1.9  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
author	jerojasro@localhost
date	Sat Oct 18 15:44:41 2008 -0500 (2008-10-18)
parents	91a936be78b8
children