hgbook: 0525fc68b7fe ja/examples/tour-merge-conflict.son.out

hgbook

Update po files with source xml files

author	Dongsheng Song <dongsheng.song@gmail.com>
date	Wed Nov 04 14:11:14 2009 +0800 (2009-11-04)
parents
children

line source

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'}