hgbook
view ja/examples/tour-merge-conflict.son.out @ 709:f9f71850ae1a
Merge with foozy
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Fri Aug 14 12:10:47 2009 -0700 (2009-08-14) |
| parents | |
| children |
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'}