Mercurial > public > mercurial-scm > hg-stable
annotate mercurial/help/common.txt @ 26957:d16d73173fdd
merge: move messages about possible conflicts a litte earlier
I actually wanted to reduce the amount of code around the call to
applyupdates(), so I tried moving these warnings a little earlier, and
I think it makes the output make a little more sense (see changes to
test cases).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 12 Nov 2015 13:14:03 -0800 |
parents | e43184680461 |
children |
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 |