comparison 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.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 06 Mar 2007 21:44:56 -0800
parents
children e281bd9a8e47
comparison
equal deleted inserted replaced
143:f2aabd15dd50 144:006bbad1f190
1 $ \textbf{cat > letter.txt <<EOF}
2 > \textbf{Greetings!}
3 > \textbf{I am Bryan O'Sullivan, no relation of the former}
4 > \textbf{Nigerian dictator Sani Abacha.}
5 > \textbf{EOF}
6 $ \textbf{hg commit -m 'Send me your money'}
7 $ \textbf{hg tip}
8 changeset:
9 tag: tip
10 parent:
11 parent:
12 user: Bryan O'Sullivan <bos@serpentine.com>
13
14 summary: Send me your money
15