hgbook
annotate ja/examples/tour-merge-conflict.commit.out @ 1030:2ac31ea48a3d
merge with trunk
| author | Romain PELISSE <belaran@gmail.com> |
|---|---|
| date | Thu Apr 22 12:39:32 2010 +0200 (2010-04-22) |
| parents | |
| children |
| rev | line source |
|---|---|
| foozy@708 | 1 $ \textbf{cat > letter.txt <<EOF} |
| foozy@708 | 2 > \textbf{Greetings!} |
| foozy@708 | 3 > \textbf{I am Bryan O'Sullivan, no relation of the former} |
| foozy@708 | 4 > \textbf{Nigerian dictator Sani Abacha.} |
| foozy@708 | 5 > \textbf{EOF} |
| foozy@708 | 6 $ \textbf{hg commit -m 'Send me your money'} |
| foozy@708 | 7 $ \textbf{hg tip} |
| foozy@708 | 8 changeset: |
| foozy@708 | 9 tag: tip |
| foozy@708 | 10 parent: |
| foozy@708 | 11 parent: |
| foozy@708 | 12 user: Bryan O'Sullivan <bos@serpentine.com> |
| foozy@708 | 13 |
| foozy@708 | 14 summary: Send me your money |
| foozy@708 | 15 |