Mercurial > hg
annotate doc/common.txt @ 18694:6a012704c841
mergetools: vimdiff issue a warning explaining how to abort
Adds a message displayed at each vimdiff invocation:
merge conflict detected, type ":cq" to abort
Vimdiff is very confusing for non-vim user (not to speak about vim user confused
anyway. However it is very likely that vimdiff is picked as the mergetool of
choice when using the default config:
- vim is available on all UNIX system.
- Its one of the rare non graphical merge tools.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 15 Feb 2013 11:28:04 +0100 |
parents | 2399362b3bb0 |
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 |