hgbook
annotate en/examples/tour-merge-conflict.wife.out @ 144:006bbad1f190
Add expected output files.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
This makes it possible to spot changes in Mercurial's output and
behaviour over time.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue Mar 06 21:44:56 2007 -0800 (2007-03-06) |
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'} |