hgbook
annotate en/examples/tour-merge-conflict.cousin.out @ 302:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
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 |
rev | line source |
---|---|
bos@144 | 1 $ \textbf{cd ..} |
bos@144 | 2 $ \textbf{hg clone scam scam-cousin} |
hg@302 | 3 updating working directory |
bos@144 | 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
bos@144 | 5 $ \textbf{cd scam-cousin} |
bos@144 | 6 $ \textbf{cat > letter.txt <<EOF} |
bos@144 | 7 > \textbf{Greetings!} |
bos@144 | 8 > \textbf{I am Shehu Musa Abacha, cousin to the former} |
bos@144 | 9 > \textbf{Nigerian dictator Sani Abacha.} |
bos@144 | 10 > \textbf{EOF} |
bos@144 | 11 $ \textbf{hg commit -m '419 scam, with cousin'} |