hgbook

view ja/examples/tour-merge-conflict.wife.out @ 1039:d0870e907b3d

1.5 partly translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Sun Nov 08 17:25:59 2009 -0500 (2009-11-08)
parents
children
line source
1 $ \textbf{cat > letter.txt <<EOF}
2 > \textbf{Greetings!}
3 > \textbf{I am Mariam Abacha, the wife of former}
4 > \textbf{Nigerian dictator Sani Abacha.}
5 > \textbf{EOF}
6 $ \textbf{hg add letter.txt}
7 $ \textbf{hg commit -m '419 scam, first draft'}