hgbook: 4aa900e1de2b en/examples/tour-merge-conflict.son.out

hgbook

Fixed sample output for 'daily.copy' test.

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 21:48:38 2008 +0200 (2008-08-20)
parents
children	e281bd9a8e47

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