hgbook
view 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 source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-cousin}
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 $ \textbf{cd scam-cousin}
6 $ \textbf{cat > letter.txt <<EOF}
7 > \textbf{Greetings!}
8 > \textbf{I am Shehu Musa Abacha, cousin to the former}
9 > \textbf{Nigerian dictator Sani Abacha.}
10 > \textbf{EOF}
11 $ \textbf{hg commit -m '419 scam, with cousin'}