CmdID

CmdID / Commands

git-mergetool

Run merge conflict resolution tools to resolve merge conflicts. tldr-pages

On several platforms

Opens CmdID with your command. It is read in your browser and sent nowhere.

Several platforms

from tldr-pages, CC BY 4.0

Launch the default merge tool to resolve conflicts

git mergetoolIdentify

List valid merge tools

git mergetool --tool-helpIdentify

Launch the merge tool identified by a name

git mergetool --tool tool_nameIdentify

Don't prompt before each invocation of the merge tool

git mergetool --no-promptIdentify

Explicitly use the GUI merge tool (see the merge.guitool configuration variable)

git mergetool --guiIdentify

Explicitly use the regular merge tool (see the merge.tool configuration variable)

git mergetool --no-guiIdentify