annotate en/examples/tour-merge-conflict.wife.out @ 231:28ddbf9f3729
Use new \hgxcmd and \hgxopt commands in a few places.
| author |
Bryan O'Sullivan <bos@serpentine.com> |
| date |
Sun May 27 09:39:58 2007 -0700 (2007-05-27) |
| 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'}
|
