hgbook

annotate en/examples/tour-merge-conflict.commit.out @ 302:e281bd9a8e47

find changesets by author, revision, files, or words in the commit message
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 Aug 20 22:00:46 2008 +0200 (2008-08-20)
parents 006bbad1f190
children 83790457e85b
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