view en/examples/results/tour-merge-conflict.wife.out @ 662:44d1363234d2

Move example output files into examples/results

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