hgbook

annotate en/examples/tour-merge-conflict.cousin.out @ 336:7e52f0cc4516

find changesets by author, revision, files, or words in the commit message
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
children
rev   line source
bos@144 1 $ \textbf{cd ..}
bos@144 2 $ \textbf{hg clone scam scam-cousin}
hg@302 3 updating working directory
bos@144 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@144 5 $ \textbf{cd scam-cousin}
bos@144 6 $ \textbf{cat > letter.txt <<EOF}
bos@144 7 > \textbf{Greetings!}
bos@144 8 > \textbf{I am Shehu Musa Abacha, cousin to the former}
bos@144 9 > \textbf{Nigerian dictator Sani Abacha.}
bos@144 10 > \textbf{EOF}
bos@144 11 $ \textbf{hg commit -m '419 scam, with cousin'}