hgbook: e281bd9a8e47 en/examples/tour-merge-conflict.cousin.out

hgbook

Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').

author	Guido Ostkamp <hg@ostkamp.fastmail.fm>
date	Wed Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents	006bbad1f190
children

line source

1 $ \textbf{cd ..}

2 $ \textbf{hg clone scam scam-cousin}

3 updating working directory

4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

5 $ \textbf{cd scam-cousin}

6 $ \textbf{cat > letter.txt <<EOF}

7 > \textbf{Greetings!}

8 > \textbf{I am Shehu Musa Abacha, cousin to the former}

9 > \textbf{Nigerian dictator Sani Abacha.}

10 > \textbf{EOF}

11 $ \textbf{hg commit -m '419 scam, with cousin'}