Mercurial > hgbook
comparison ja/examples/tour-merge-conflict.commit.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.commit.out@006bbad1f190 |
| children |
comparison
equal
deleted
inserted
replaced
| 289:7be02466421b | 290:b0db5adf11c1 |
|---|---|
| 1 $ \textbf{cat > letter.txt <<EOF} | |
| 2 > \textbf{Greetings!} | |
| 3 > \textbf{I am Bryan O'Sullivan, no relation of the former} | |
| 4 > \textbf{Nigerian dictator Sani Abacha.} | |
| 5 > \textbf{EOF} | |
| 6 $ \textbf{hg commit -m 'Send me your money'} | |
| 7 $ \textbf{hg tip} | |
| 8 changeset: | |
| 9 tag: tip | |
| 10 parent: | |
| 11 parent: | |
| 12 user: Bryan O'Sullivan <bos@serpentine.com> | |
| 13 | |
| 14 summary: Send me your money | |
| 15 |