hgbook
annotate en/examples/tour-merge-conflict.commit.out @ 318:f3bef43b8ca1
Trim more obsolete SVN advantages
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Aug 26 14:14:19 2008 -0700 (2008-08-26) |
| parents | 006bbad1f190 |
| children | 83790457e85b |
| 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} |
| hg@302 | 6 $ \textbf{hg resolve -m letter.txt} |
| bos@144 | 7 $ \textbf{hg commit -m 'Send me your money'} |
| bos@144 | 8 $ \textbf{hg tip} |
| bos@144 | 9 changeset: |
| bos@144 | 10 tag: tip |
| bos@144 | 11 parent: |
| bos@144 | 12 parent: |
| bos@144 | 13 user: Bryan O'Sullivan <bos@serpentine.com> |
| bos@144 | 14 |
| bos@144 | 15 summary: Send me your money |
| bos@144 | 16 |