hgbook
annotate en/examples/tour-merge-conflict.commit.out @ 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
| parents | 83790457e85b |
| children |
| 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 |