hgbook

annotate en/examples/tour-merge-conflict.commit.out @ 254:7301e64c362e

find changesets by author, revision, files, or words in the commit message
Chris Mason's "rej" tool has been superseded by "mpatch", per David Rushby.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed May 30 22:18:04 2007 -0700 (2007-05-30)
parents
children e281bd9a8e47
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}
bos@144 6 $ \textbf{hg commit -m 'Send me your money'}
bos@144 7 $ \textbf{hg tip}
bos@144 8 changeset:
bos@144 9 tag: tip
bos@144 10 parent:
bos@144 11 parent:
bos@144 12 user: Bryan O'Sullivan <bos@serpentine.com>
bos@144 13
bos@144 14 summary: Send me your money
bos@144 15