diff en/examples/results/tour-merge-conflict.pull.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.pull.out	Mon Mar 09 21:37:47 2009 -0700
@@ -0,0 +1,14 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam-cousin scam-merge}
+updating working directory
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-merge}
+$ \textbf{hg pull -u ../scam-son}
+pulling from ../scam-son
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files (+1 heads)
+not updating, since new heads added
+(run 'hg heads' to see heads, 'hg merge' to merge)