annotate en/examples/tour-merge-conflict.wife.out @ 411:006cd2b41d11
corrected translation of a term
author |
Javier Rojas <jerojasro@devnull.li> |
date |
Mon Nov 10 22:20:46 2008 -0500 (2008-11-10) |
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'}
|