Mercurial > hgbook
view en/examples/tour-merge-conflict.commit.out @ 150:8cf40d4d9377
Fix broken example.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu, 08 Mar 2007 23:11:55 -0800 |
parents | 006bbad1f190 |
children | e281bd9a8e47 |
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