git-mergetool

Run merge tool

$ git mergetool

$ git mergetool --tool=[vimdiff]

$ git mergetool [file.txt]

$ git mergetool --no-prompt

$ git mergetool -y

git mergetool [options] [file]

git mergetool runs a merge conflict resolution tool. It launches configured tools like vimdiff, meld, or kdiff3 on each conflicted file, providing visual three-way merge interfaces.
The tool shows base, local, and remote versions side by side. After saving the merged result, the file is marked as resolved. Multiple files are processed sequentially.
git mergetool provides visual conflict resolution.

FILE

Specific file to resolve.

Use specified merge tool.

List available tools.

Don't prompt before each file.

Prompt before each file.

Display help information.

Requires configured merge tool. Creates .orig backup files. Some tools need installation.

git mergetool is a core Git command providing integration with external merge tools, essential for complex conflict resolution.

git-merge(1), git-difftool(1), vimdiff(1)