hgbook
diff en/examples/results/tour-merge-conflict.cousin.out @ 563:44d1363234d2
Move example output files into examples/results
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Mon Mar 09 21:37:47 2009 -0700 (2009-03-09) |
parents | en/examples/tour-merge-conflict.cousin.out@e281bd9a8e47 |
children | 0d5935744f87 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/en/examples/results/tour-merge-conflict.cousin.out Mon Mar 09 21:37:47 2009 -0700 1.3 @@ -0,0 +1,11 @@ 1.4 +$ \textbf{cd ..} 1.5 +$ \textbf{hg clone scam scam-cousin} 1.6 +updating working directory 1.7 +1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1.8 +$ \textbf{cd scam-cousin} 1.9 +$ \textbf{cat > letter.txt <<EOF} 1.10 +> \textbf{Greetings!} 1.11 +> \textbf{I am Shehu Musa Abacha, cousin to the former} 1.12 +> \textbf{Nigerian dictator Sani Abacha.} 1.13 +> \textbf{EOF} 1.14 +$ \textbf{hg commit -m '419 scam, with cousin'}