annotate en/examples/tour-merge-conflict.cousin.out @ 299:2936cb7eae7a
Fix sample output for test 'branch-named'.
| author |
Guido Ostkamp <hg@ostkamp.fastmail.fm> |
| date |
Wed Aug 20 21:55:35 2008 +0200 (2008-08-20) |
| parents |
|
| children |
e281bd9a8e47 |
| rev |
line source |
|
bos@144
|
1 $ \textbf{cd ..}
|
|
bos@144
|
2 $ \textbf{hg clone scam scam-cousin}
|
|
bos@144
|
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
bos@144
|
4 $ \textbf{cd scam-cousin}
|
|
bos@144
|
5 $ \textbf{cat > letter.txt <<EOF}
|
|
bos@144
|
6 > \textbf{Greetings!}
|
|
bos@144
|
7 > \textbf{I am Shehu Musa Abacha, cousin to the former}
|
|
bos@144
|
8 > \textbf{Nigerian dictator Sani Abacha.}
|
|
bos@144
|
9 > \textbf{EOF}
|
|
bos@144
|
10 $ \textbf{hg commit -m '419 scam, with cousin'}
|
