annotate en/examples/tour-merge-conflict.wife.out @ 161:7f07aca44938
Write up the unpleasant effects of change ef1f1a4b2efb in the hg tree.
author |
Bryan O'Sullivan <bos@serpentine.com> |
date |
Mon Mar 26 21:58:24 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'}
|