Mercurial > hg

comparison mercurial/commands.py @ 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 fc035e5370ca
children 2d710c12ffc0
comparison
equal deleted inserted replaced
15231:cd6f10dccf16 15232:5d9a5b919863
4330 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified 4330 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified
4331 files, discarding any previous merge attempts. Re-merging is not 4331 files, discarding any previous merge attempts. Re-merging is not
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
4339 to mark all unresolved files. 4340 to mark all unresolved files.
4340 4341