hgbook
annotate ja/examples/tour-merge-conflict.son.out @ 993:71dbda516572
French translation : merge with Jean Marie Clement's work on ch04-concepts
| author | Frédéric Bouquet <youshe.jaalon@gmail.com> |
|---|---|
| date | Fri Sep 11 14:35:36 2009 +0200 (2009-09-11) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{cd ..} |
| foozy@708 | 2 $ \textbf{hg clone scam scam-son} |
| foozy@708 | 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| foozy@708 | 4 $ \textbf{cd scam-son} |
| foozy@708 | 5 $ \textbf{cat > letter.txt <<EOF} |
| foozy@708 | 6 > \textbf{Greetings!} |
| foozy@708 | 7 > \textbf{I am Alhaji Abba Abacha, son of the former} |
| foozy@708 | 8 > \textbf{Nigerian dictator Sani Abacha.} |
| foozy@708 | 9 > \textbf{EOF} |
| foozy@708 | 10 $ \textbf{hg commit -m '419 scam, with son'} |