diff en/examples/results/tour-merge-conflict.cousin.out @ 662:44d1363234d2

Move example output files into examples/results

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/en/examples/results/tour-merge-conflict.cousin.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,11 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam scam-cousin}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-cousin}
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Shehu Musa Abacha, cousin to the former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg commit -m '419 scam, with cousin'}