Mercurial > hgbook
view en/examples/tour-merge-conflict.commit.out @ 401:e281bd9a8e47
Fix sample output for test 'tour-merge-conflict'.
Fix test itself as well (now requires 'hg resolve').
author | Guido Ostkamp <hg@ostkamp.fastmail.fm> |
---|---|
date | Wed, 20 Aug 2008 22:00:46 +0200 |
parents | 006bbad1f190 |
children | 83790457e85b |
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 resolve -m letter.txt} $ \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