Mercurial > hgbook
view ja/examples/tour-merge-conflict.commit.out @ 802:de4142983445
Propagate 3b640272a966
Progres on resolve
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 21 Jun 2009 09:20:47 +0900 |
parents | b0db5adf11c1 |
children |
line wrap: on
line source
$ \textbf{cat > letter.txt <<EOF} > \textbf{Greetings!} > \textbf{I am Bryan O'Sullivan, no relation of the former} > \textbf{Nigerian dictator Sani Abacha.} > \textbf{EOF} $ \textbf{hg commit -m 'Send me your money'} $ \textbf{hg tip} changeset: tag: tip parent: parent: user: Bryan O'Sullivan <bos@serpentine.com> summary: Send me your money