hgbook
annotate en/examples/tour-merge-conflict.wife.out @ 168:f8b5b782e150
Backed out changeset 08a4467f489162c14cf17b94aa771a23dd6f02dc
It just didn't work. Sigh.
It just didn't work. Sigh.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 26 23:20:59 2007 -0700 (2007-03-26) |
parents | |
children |
rev | line source |
---|---|
bos@144 | 1 $ \textbf{cat > letter.txt <<EOF} |
bos@144 | 2 > \textbf{Greetings!} |
bos@144 | 3 > \textbf{I am Mariam Abacha, the wife of former} |
bos@144 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
bos@144 | 5 > \textbf{EOF} |
bos@144 | 6 $ \textbf{hg add letter.txt} |
bos@144 | 7 $ \textbf{hg commit -m '419 scam, first draft'} |