hgbook

annotate en/examples/tour-merge-conflict.cousin.out @ 260:ec6a3bb10986

find changesets by author, revision, files, or words in the commit message
HTML: replace Unicode ligatures with plain ASCII.
Thanks to Johannes Hoff for spotting this.
author Bryan O'Sullivan <bos@serpentine.com>
date Sun Jun 17 11:09:13 2007 -0700 (2007-06-17)
parents
children e281bd9a8e47
rev   line source
bos@144 1 $ \textbf{cd ..}
bos@144 2 $ \textbf{hg clone scam scam-cousin}
bos@144 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@144 4 $ \textbf{cd scam-cousin}
bos@144 5 $ \textbf{cat > letter.txt <<EOF}
bos@144 6 > \textbf{Greetings!}
bos@144 7 > \textbf{I am Shehu Musa Abacha, cousin to the former}
bos@144 8 > \textbf{Nigerian dictator Sani Abacha.}
bos@144 9 > \textbf{EOF}
bos@144 10 $ \textbf{hg commit -m '419 scam, with cousin'}