tldr/pages/common/git-mergetool.md

29 lines
669 B
Markdown
Raw Normal View History

2020-03-30 10:13:26 +01:00
# git mergetool
> Run merge conflict resolution tools to resolve merge conflicts.
> More information: <https://git-scm.com/docs/git-mergetool>.
- 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 --tool {{tool_name}}`
- Don't prompt before each invocation of the merge tool:
`git mergetool --no-prompt`
- Explicitly use the GUI merge tool (see the `merge.guitool` configuration variable):
2020-03-30 10:13:26 +01:00
`git mergetool --gui`
- Explicitly use the regular merge tool (see the `merge.tool` configuration variable):
2020-03-30 10:13:26 +01:00
`git mergetool --no-gui`