annotate en/examples/tour-merge-conflict.wife.out @ 534:22af452c6c59
finished revision of branch.tex. beginning revision of daily.tex
author |
Javier Rojas <jerojasro@devnull.li> |
date |
Sun Jan 25 20:20:37 2009 -0500 (2009-01-25) |
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'}
|