hgbook

view en/examples/issue29.go.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
children
line source
1 $ \textbf{hg init issue29}
2 $ \textbf{cd issue29}
3 $ \textbf{echo a > a}
4 $ \textbf{hg ci -Ama}
5 adding a
6 $ \textbf{echo b > b}
7 $ \textbf{hg ci -Amb}
8 adding b
9 $ \textbf{hg up 0}
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
11 $ \textbf{mkdir b}
12 $ \textbf{echo b > b/b}
13 $ \textbf{hg ci -Amc}
14 adding b/b
15 created new head
16 $ \textbf{hg merge}