view en/examples/tour-merge-conflict.wife.out @ 530:f809de31887a

more translation :D added a term to the glossary

$ \textbf{cat > letter.txt <<EOF}
> \textbf{Greetings!}
> \textbf{I am Mariam Abacha, the wife of former}
> \textbf{Nigerian dictator Sani Abacha.}
> \textbf{EOF}
$ \textbf{hg add letter.txt}
$ \textbf{hg commit -m '419 scam, first draft'}