Mercurial > hgbook
diff 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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ja/examples/tour-merge-conflict.commit.out Wed Feb 06 17:43:11 2008 +0900 @@ -0,0 +1,15 @@ +$ \textbf{cat > letter.txt <<EOF} +> \textbf{Greetings!} +> \textbf{I am Bryan O'Sullivan, no relation of the former} +> \textbf{Nigerian dictator Sani Abacha.} +> \textbf{EOF} +$ \textbf{hg commit -m 'Send me your money'} +$ \textbf{hg tip} +changeset: +tag: tip +parent: +parent: +user: Bryan O'Sullivan <bos@serpentine.com> + +summary: Send me your money +