hgbook
view ja/examples/tour-merge-conflict.cousin.out @ 1042:b08a63383d04
1.6.1 2 para translated
| author | zhaopingsun |
|---|---|
| date | Mon Nov 09 21:53:10 2009 -0500 (2009-11-09) |
| parents | |
| children |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-cousin}
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd scam-cousin}
5 $ \textbf{cat > letter.txt <<EOF}
6 > \textbf{Greetings!}
7 > \textbf{I am Shehu Musa Abacha, cousin to the former}
8 > \textbf{Nigerian dictator Sani Abacha.}
9 > \textbf{EOF}
10 $ \textbf{hg commit -m '419 scam, with cousin'}