hgbook
diff en/examples/tour-merge-conflict.wife.out @ 940:1dc7475ccab1
Work in progress on tour-basic
author | Romain PELISSE <belaran@gmail.com> |
---|---|
date | Mon Feb 16 18:24:25 2009 +0100 (2009-02-16) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/tour-merge-conflict.wife.out Mon Feb 16 18:24:25 2009 +0100 1.3 @@ -0,0 +1,7 @@ 1.4 +$ \textbf{cat > letter.txt <<EOF} 1.5 +> \textbf{Greetings!} 1.6 +> \textbf{I am Mariam Abacha, the wife of former} 1.7 +> \textbf{Nigerian dictator Sani Abacha.} 1.8 +> \textbf{EOF} 1.9 +$ \textbf{hg add letter.txt} 1.10 +$ \textbf{hg commit -m '419 scam, first draft'}