hgbook
view en/examples/tour-merge-conflict.commit.out @ 191:f078515438d2
Account for changed output.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Mon Apr 16 14:39:20 2007 -0700 (2007-04-16) |
| parents | |
| children | e281bd9a8e47 |
line source
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>
14 summary: Send me your money