equal
deleted
inserted
replaced
4073 The resolve command can be used in the following ways: |
4073 The resolve command can be used in the following ways: |
4074 |
4074 |
4075 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
4075 - :hg:`resolve [--tool TOOL] FILE...`: attempt to re-merge the specified |
4076 files, discarding any previous merge attempts. Re-merging is not |
4076 files, discarding any previous merge attempts. Re-merging is not |
4077 performed for files already marked as resolved. Use ``--all/-a`` |
4077 performed for files already marked as resolved. Use ``--all/-a`` |
4078 to selects all unresolved files. ``--tool`` can be used to specify |
4078 to select all unresolved files. ``--tool`` can be used to specify |
4079 the merge tool used for the given files. It overrides the HGMERGE |
4079 the merge tool used for the given files. It overrides the HGMERGE |
4080 environment variable and your configuration files. |
4080 environment variable and your configuration files. |
4081 |
4081 |
4082 - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
4082 - :hg:`resolve -m [FILE]`: mark a file as having been resolved |
4083 (e.g. after having manually fixed-up the files). The default is |
4083 (e.g. after having manually fixed-up the files). The default is |