view en/examples/tour-merge-conflict.wife.out @ 146:65f6f9d18fa1

Oops! I forgot that I need the undoctored output files in the book! Now they're named "*.lxo", instead of "*.out". Ugh.

$ \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'}