Mercurial > hgbook

annotate en/examples/tour-merge-conflict.cousin.out @ 155:914babdc99c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-example: better error if bogus section name found. Fix all such bogus names in sources.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 12 Mar 2007 23:10:32 -0700
parents 006bbad1f190
children e281bd9a8e47
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{cd ..}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
2 $ \textbf{hg clone scam scam-cousin}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
4 $ \textbf{cd scam-cousin}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
5 $ \textbf{cat > letter.txt <<EOF}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
6 > \textbf{Greetings!}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
7 > \textbf{I am Shehu Musa Abacha, cousin to the former}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
8 > \textbf{Nigerian dictator Sani Abacha.}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
9 > \textbf{EOF}
006bbad1f190 Add expected output files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset
10 $ \textbf{hg commit -m '419 scam, with cousin'}