hgbook
annotate ja/examples/tour-merge-conflict.wife.out @ 1089:0e202b76f958
2.5.0 2 para
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Sun Nov 22 21:35:38 2009 -0500 (2009-11-22) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{cat > letter.txt <<EOF} |
| foozy@708 | 2 > \textbf{Greetings!} |
| foozy@708 | 3 > \textbf{I am Mariam Abacha, the wife of former} |
| foozy@708 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
| foozy@708 | 5 > \textbf{EOF} |
| foozy@708 | 6 $ \textbf{hg add letter.txt} |
| foozy@708 | 7 $ \textbf{hg commit -m '419 scam, first draft'} |