Mercurial > hg

changeset 15232:5d9a5b919863

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: update documentation to mention the .orig backup
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Tue, 11 Oct 2011 18:48:45 +0200
parents cd6f10dccf16
children 81c97964d123
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Oct 11 18:18:15 2011 -0700
+++ b/mercurial/commands.py	Tue Oct 11 18:48:45 2011 +0200
@@ -4332,7 +4332,8 @@
       performed for files already marked as resolved. Use ``--all/-a``
       to select all unresolved files. ``--tool`` can be used to specify
       the merge tool used for the given files. It overrides the HGMERGE
-      environment variable and your configuration files.
+      environment variable and your configuration files.  Previous file
+      contents are saved with a ``.orig`` suffix.
 
     - :hg:`resolve -m [FILE]`: mark a file as having been resolved
       (e.g. after having manually fixed-up the files). The default is