Mercurial > hgbook
comparison ja/examples/tour-merge-conflict.son.out @ 290:b0db5adf11c1 ja_root
fork Japanese translation.
| author | Yoshiki Yazawa <yaz@cc.rim.or.jp> |
|---|---|
| date | Wed, 06 Feb 2008 17:43:11 +0900 |
| parents | en/examples/tour-merge-conflict.son.out@006bbad1f190 |
| children |
comparison
equal
deleted
inserted
replaced
| 289:7be02466421b | 290:b0db5adf11c1 |
|---|---|
| 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'} |