hgbook

diff en/examples/branch-named.update.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)
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/examples/branch-named.update.out	Sat Oct 18 15:44:41 2008 -0500
     1.3 @@ -0,0 +1,13 @@
     1.4 +$ \textbf{hg update foo}
     1.5 +0 files updated, 0 files merged, 1 files removed, 0 files unresolved
     1.6 +$ \textbf{hg update}
     1.7 +0 files updated, 0 files merged, 0 files removed, 0 files unresolved
     1.8 +$ \textbf{hg parent}
     1.9 +changeset:   
    1.10 +branch:      foo
    1.11 +user:        Bryan O'Sullivan <bos@serpentine.com>
    1.12 +
    1.13 +summary:     Second commit
    1.14 +
    1.15 +$ \textbf{hg update bar}
    1.16 +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
children