view en/examples/tour-merge-conflict.cousin.out @ 401:e281bd9a8e47

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

$ \textbf{cd ..}
$ \textbf{hg clone scam scam-cousin}
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ \textbf{cd scam-cousin}
$ \textbf{cat > letter.txt <<EOF}
> \textbf{Greetings!}
> \textbf{I am Shehu Musa Abacha, cousin to the former}
> \textbf{Nigerian dictator Sani Abacha.}
> \textbf{EOF}
$ \textbf{hg commit -m '419 scam, with cousin'}