hgbook
view 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 |
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 resolve -m letter.txt}
7 $ \textbf{hg commit -m 'Send me your money'}
8 $ \textbf{hg tip}
9 changeset:
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
15 summary: Send me your money