hgbook

annotate en/examples/mq.tutorial.qrefresh.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 00f69e8825c5
children 5ffee9123bbf
rev   line source
bos@144 1 $ \textbf{echo 'line 2' >> file1}
bos@144 2 $ \textbf{hg diff}
bos@144 3 diff -r file1
bos@144 4
bos@144 5
hg@297 6 @@ -1,1 +1,2 @@
bos@144 7 line 1
bos@144 8 +line 2
bos@144 9 $ \textbf{hg qrefresh}
bos@144 10 $ \textbf{hg diff}
bos@144 11 $ \textbf{hg tip --style=compact --patch}
bos@144 12 1[qtip,first.patch,tip,qbase]
bos@273 13 [mq]: first.patch
bos@144 14
bos@144 15 diff -r -r file1
bos@144 16
bos@144 17
hg@297 18 @@ -1,1 +1,2 @@
bos@144 19 line 1
bos@144 20 +line 2
bos@144 21