annotate en/examples/results/tour-merge-conflict.wife.out @ 563:44d1363234d2
Move example output files into examples/results
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
| parents |
en/examples/tour-merge-conflict.wife.out@006bbad1f190 |
| children |
0d5935744f87 |
| 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'}
|
