Mercurial > hgbook

diff ja/examples/tour-merge-conflict.son.out @ 290:b0db5adf11c1 ja_root

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ja/examples/tour-merge-conflict.son.out	Wed Feb 06 17:43:11 2008 +0900
@@ -0,0 +1,10 @@
+$ \textbf{cd ..}
+$ \textbf{hg clone scam scam-son}
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ \textbf{cd scam-son}
+$ \textbf{cat > letter.txt <<EOF}
+> \textbf{Greetings!}
+> \textbf{I am Alhaji Abba Abacha, son of the former}
+> \textbf{Nigerian dictator Sani Abacha.}
+> \textbf{EOF}
+$ \textbf{hg commit -m '419 scam, with son'}