hgbook
view ja/examples/tour-merge-conflict.son.out @ 963:1dd00abb3fa9
merge with bryan - it's been a while but everything seems ok
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sun Aug 16 03:41:39 2009 +0200 (2009-08-16) |
| 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'}