annotate en/examples/results/tour-merge-conflict.son.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.son.out@e281bd9a8e47 |
| children |
0d5935744f87 |
| rev |
line source |
|
bos@144
|
1 $ \textbf{cd ..}
|
|
bos@144
|
2 $ \textbf{hg clone scam scam-son}
|
|
hg@302
|
3 updating working directory
|
|
bos@144
|
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
5 $ \textbf{cd scam-son}
|
|
bos@144
|
6 $ \textbf{cat > letter.txt <<EOF}
|
|
bos@144
|
7 > \textbf{Greetings!}
|
|
bos@144
|
8 > \textbf{I am Alhaji Abba Abacha, son of the former}
|
|
bos@144
|
9 > \textbf{Nigerian dictator Sani Abacha.}
|
|
bos@144
|
10 > \textbf{EOF}
|
|
bos@144
|
11 $ \textbf{hg commit -m '419 scam, with son'}
|
