hgbook

annotate en/examples/tour-merge-conflict.son.out @ 144:006bbad1f190

find changesets by author, revision, files, or words in the commit message
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue Mar 06 21:44:56 2007 -0800 (2007-03-06)
parents
children e281bd9a8e47
rev   line source
bos@144 1 $ \textbf{cd ..}
bos@144 2 $ \textbf{hg clone scam scam-son}
bos@144 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bos@144 4 $ \textbf{cd scam-son}
bos@144 5 $ \textbf{cat > letter.txt <<EOF}
bos@144 6 > \textbf{Greetings!}
bos@144 7 > \textbf{I am Alhaji Abba Abacha, son of 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 son'}