git mergetool

all

Run merge conflict resolution tools to resolve merge conflicts.

Options (3)

-t, --toolboolean

Launch the merge tool identified by a name

Example: git mergetool {{[-t|--tool]}} {{tool_name}}

-y, --no-promptboolean

Don't prompt before each invocation of the merge tool

Example: git mergetool {{[-y|--no-prompt]}}

-g, --guiboolean

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

Example: git mergetool {{[-g|--gui]}}

Launch the default merge tool to resolve conflicts

git mergetool

List valid merge tools

git mergetool --tool-help

Launch the merge tool identified by a name

git mergetool [-t|--tool] tool_name

Don't prompt before each invocation of the merge tool

git mergetool [-y|--no-prompt]

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

git mergetool [-g|--gui]

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

git mergetool --no-gui