Mercurial > hg-stable

changeset 29060:db74d95299af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: wrap ".orig" in rst quotes Apparently, .orig. is a macro for man pages so we need to wrap it in quotes to silence lintian warnings.
author Sean Farley <sean@farley.io>
date Sat, 30 Apr 2016 18:40:34 -0700
parents 8eba4cdcfd81
children fc88a942fe8d
files mercurial/help/config.txt
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/help/config.txt	Sun Apr 17 12:31:06 2016 +0900
+++ b/mercurial/help/config.txt	Sat Apr 30 18:40:34 2016 -0700
@@ -1020,8 +1020,8 @@
    file in the changeset being merged or updated to, and has different
    contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``,
    abort on such files. With ``warn``, warn on such files and back them up as
-   .orig. With ``ignore``, don't print a warning and back them up as
-   .orig. (default: ``abort``)
+   ``.orig``. With ``ignore``, don't print a warning and back them up as
+   ``.orig``. (default: ``abort``)
 
 ``checkunknown``
    Controls behavior when an unknown file that isn't ignored has the same name