annotate doc/common.txt @ 12314:f2daa6ab514a

merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Without specifying the parent revision of the working copy, users will update to tip, which is most likely the other head they were trying to merge, not the revision they were at before the merge.
author Brodie Rao <brodie@bitheap.org>
date Sun, 12 Sep 2010 18:05:53 -0500
parents 2399362b3bb0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9162
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
1 .. Common link and substitution definitions.
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
2
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
3 .. |hg(1)| replace:: **hg**\ (1)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
4 .. _hg(1): hg.1.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
5 .. |hgrc(5)| replace:: **hgrc**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
6 .. _hgrc(5): hgrc.5.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
7 .. |hgignore(5)| replace:: **hgignore**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
8 .. _hgignore(5): hgignore.5.html