hgbook
view ja/examples/tour-merge-conflict.commit.out @ 996:6f8c48362758
merge with trunk
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Sat Sep 12 17:58:56 2009 +0200 (2009-09-12) |
| parents | |
| children |
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