hgbook
annotate en/examples/tour-merge-conflict.commit.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 | e281bd9a8e47 |
rev | line source |
---|---|
bos@144 | 1 $ \textbf{cat > letter.txt <<EOF} |
bos@144 | 2 > \textbf{Greetings!} |
bos@144 | 3 > \textbf{I am Bryan O'Sullivan, no relation of the former} |
bos@144 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
bos@144 | 5 > \textbf{EOF} |
bos@144 | 6 $ \textbf{hg commit -m 'Send me your money'} |
bos@144 | 7 $ \textbf{hg tip} |
bos@144 | 8 changeset: |
bos@144 | 9 tag: tip |
bos@144 | 10 parent: |
bos@144 | 11 parent: |
bos@144 | 12 user: Bryan O'Sullivan <bos@serpentine.com> |
bos@144 | 13 |
bos@144 | 14 summary: Send me your money |
bos@144 | 15 |