hgbook
view en/examples/tour-merge-conflict.son.out @ 193:8b33c890e777
Something interesting happened, but I don't have time to look and see.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Apr 16 14:41:21 2007 -0700 (2007-04-16) |
| parents | |
| children | e281bd9a8e47 |
line source
1 $ \textbf{cd ..}
2 $ \textbf{hg clone scam scam-son}
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 $ \textbf{cd scam-son}
5 $ \textbf{cat > letter.txt <<EOF}
6 > \textbf{Greetings!}
7 > \textbf{I am Alhaji Abba Abacha, son of the former}
8 > \textbf{Nigerian dictator Sani Abacha.}
9 > \textbf{EOF}
10 $ \textbf{hg commit -m '419 scam, with son'}