annotate en/examples/tour-merge-conflict.cousin.out @ 708:d6ca1334a19d
Japanese translation on a24b370a16ee
author |
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
date |
Fri Jul 31 19:49:16 2009 +0900 (2009-07-31) |
parents |
|
children |
e281bd9a8e47 |
rev |
line source |
bos@144
|
1 $ \textbf{cd ..}
|
bos@144
|
2 $ \textbf{hg clone scam scam-cousin}
|
bos@144
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
bos@144
|
4 $ \textbf{cd scam-cousin}
|
bos@144
|
5 $ \textbf{cat > letter.txt <<EOF}
|
bos@144
|
6 > \textbf{Greetings!}
|
bos@144
|
7 > \textbf{I am Shehu Musa Abacha, cousin to the former}
|
bos@144
|
8 > \textbf{Nigerian dictator Sani Abacha.}
|
bos@144
|
9 > \textbf{EOF}
|
bos@144
|
10 $ \textbf{hg commit -m '419 scam, with cousin'}
|