Mercurial > hgbook

annotate en/examples/tour-merge-conflict.wife.out @ 431:d13a05515acf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing problem on bisect that inhibits building with mercurial 1.0 or later
author Igor Támara <igor@tamarapatino.org>
date Sat, 18 Oct 2008 06:02:21 -0500
parents 006bbad1f190
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 Mariam Abacha, the wife of 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}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 $ \textbf{hg add letter.txt}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 $ \textbf{hg commit -m '419 scam, first draft'}