hgbook

view en/examples/results/tour-merge-conflict.commit.out @ 563:44d1363234d2

find changesets by author, revision, files, or words in the commit message
Move example output files into examples/results
author Bryan O'Sullivan <bos@serpentine.com>
date Mon Mar 09 21:37:47 2009 -0700 (2009-03-09)
parents en/examples/tour-merge-conflict.commit.out@bc14f94e726a
children 0d5935744f87
line source
1 $ \textbf{cat > letter.txt <<EOF}
2 > \textbf{Greetings!}
3 > \textbf{I am Bryan O'Sullivan, no relation of the former}
4 > \textbf{Nigerian dictator Sani Abacha.}
5 > \textbf{EOF}
6 $ \textbf{hg resolve -m letter.txt}
7 $ \textbf{hg commit -m 'Send me your money'}
8 $ \textbf{hg tip}
9 changeset:
10 tag: tip
11 parent:
12 parent:
13 user: Bryan O'Sullivan <bos@serpentine.com>
14
15 summary: Send me your money
16