annotate en/examples/tour-merge-conflict.wife.out @ 176:edd2acc3dbab
Fix build bogon.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Wed Mar 28 22:55:13 2007 -0700 (2007-03-28) |
| 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'}
|
