annotate en/examples/tour-merge-conflict.wife.out @ 356:0db175abfaf3
some friggin' merge or something like that.
| author |
jerojasro@localhost |
| date |
Tue Oct 21 22:41:51 2008 -0500 (2008-10-21) |
| parents |
|
| children |
|
| rev |
line source |
|
bos@144
|
1 $ \textbf{cat > letter.txt <<EOF}
|
|
bos@144
|
2 > \textbf{Greetings!}
|
|
bos@144
|
3 > \textbf{I am Mariam Abacha, the wife of former}
|
|
bos@144
|
4 > \textbf{Nigerian dictator Sani Abacha.}
|
|
bos@144
|
5 > \textbf{EOF}
|
|
bos@144
|
6 $ \textbf{hg add letter.txt}
|
|
bos@144
|
7 $ \textbf{hg commit -m '419 scam, first draft'}
|
