2941     :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the

  2941     :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the

  2942     working directory must have two parents).

  2942     working directory must have two parents).

  2943 

  2943 

  2944     The resolve command can be used in the following ways:

  2944     The resolve command can be used in the following ways:

  2945 

  2945 

  2947       files, discarding any previous merge attempts. Re-merging is not

  2947       files, discarding any previous merge attempts. Re-merging is not

  2948       performed for files already marked as resolved. Use ``--all/-a``

  2948       performed for files already marked as resolved. Use ``--all/-a``

  2949       to selects all unresolved files. ``--tool`` can be used to specify

  2949       to selects all unresolved files. ``--tool`` can be used to specify

  2950       the merge tool used for the given files. It overrides the HGMERGE

  2950       the merge tool used for the given files. It overrides the HGMERGE

  2951       environment variable and your configuration files.

  2951       environment variable and your configuration files.