Mercurial > hgbook

annotate en/examples/tour-merge-conflict.commit.out @ 648:bc14f94e726a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Check in a known-broken example to fix up later - XXX
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 29 Jan 2009 22:47:34 -0800
parents 83790457e85b
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
1 $ \textbf{cat > letter.txt <<EOF}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 > \textbf{Greetings!}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 > \textbf{I am Bryan O'Sullivan, no relation of the former}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 > \textbf{Nigerian dictator Sani Abacha.}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 > \textbf{EOF}
401
e281bd9a8e47 Fix sample output for test 'tour-merge-conflict'.
Guido Ostkamp <hg@ostkamp.fastmail.fm>
parents: 144
diff changeset
6 $ \textbf{hg resolve -m letter.txt}
144
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 $ \textbf{hg commit -m 'Send me your money'}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 $ \textbf{hg tip}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 changeset:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 tag: tip
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
11 parent:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
12 parent:
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
13 user: Bryan O'Sullivan <bos@serpentine.com>
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
14
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
15 summary: Send me your money
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
16