hgbook
view en/examples/tour-merge-conflict.son.out @ 507:7f463aab0c07
merged ikks' changes
| author | Javier Rojas <jerojasro@devnull.li> |
|---|---|
| date | Mon Jan 12 10:54:44 2009 -0500 (2009-01-12) |
| parents | 006bbad1f190 |
| children |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-son}
3 updating working directory
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 $ \textbf{cd scam-son}
6 $ \textbf{cat > letter.txt <<EOF}
7 > \textbf{Greetings!}
8 > \textbf{I am Alhaji Abba Abacha, son of the former}
9 > \textbf{Nigerian dictator Sani Abacha.}
10 > \textbf{EOF}
11 $ \textbf{hg commit -m '419 scam, with son'}