##// END OF EJS Templates
resolve: mention merge-tools topic in help
Augie Fackler -
r16009:f1208827 stable
parent child Browse files
Show More
@@ -4603,7 +4603,8 b' def resolve(ui, repo, *pats, **opts):'
4603 setting, or a command-line merge tool like ``diff3``. The resolve
4603 setting, or a command-line merge tool like ``diff3``. The resolve
4604 command is used to manage the files involved in a merge, after
4604 command is used to manage the files involved in a merge, after
4605 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4605 :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the
4606 working directory must have two parents).
4606 working directory must have two parents). See :hg:`help
4607 merge-tools` for information on configuring merge tools.
4607
4608
4608 The resolve command can be used in the following ways:
4609 The resolve command can be used in the following ways:
4609
4610
General Comments 0
You need to be logged in to leave comments. Login now