##// END OF EJS Templates
resolve: update documentation to mention the .orig backup
Pierre-Yves David -
r15232:5d9a5b91 default
parent child Browse files
Show More
@@ -4332,7 +4332,8 b' def resolve(ui, repo, *pats, **opts):'
4332 performed for files already marked as resolved. Use ``--all/-a``
4332 performed for files already marked as resolved. Use ``--all/-a``
4333 to select all unresolved files. ``--tool`` can be used to specify
4333 to select all unresolved files. ``--tool`` can be used to specify
4334 the merge tool used for the given files. It overrides the HGMERGE
4334 the merge tool used for the given files. It overrides the HGMERGE
4335 environment variable and your configuration files.
4335 environment variable and your configuration files. Previous file
4336 contents are saved with a ``.orig`` suffix.
4336
4337
4337 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4338 - :hg:`resolve -m [FILE]`: mark a file as having been resolved
4338 (e.g. after having manually fixed-up the files). The default is
4339 (e.g. after having manually fixed-up the files). The default is
General Comments 0
You need to be logged in to leave comments. Login now