[PATCH] resolve: update documentation to mention the .orig backup

[pierre-yves.david at logilab.fr]

# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at logilab.fr>
# Date 1318351725 -7200
# Node ID b66f145a34301a05c801a477a15fd99423855dd4
# Parent  231aac5280baae0614d7f278bb306b95c4a1488b
resolve: update documentation to mention the .orig backup

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4324,11 +4324,13 @@ def resolve(ui, repo, *pats, **opts):
     - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
       files, discarding any previous merge attempts. Re-merging is not
       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 merge
+      attempts 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
       to mark all unresolved files.