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 visual merge conflict resolution tool for each conflicted file. It launches configured tools like vimdiff, meld, or kdiff3, providing a three-way merge interface showing the base, local, and remote versions side by side.
After saving the merged result in the tool, the file is marked as resolved. Multiple conflicted files are processed sequentially, and you can choose to skip individual files.

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.

~/.gitconfig

Configure default merge tool and tool-specific settings.

$ [merge]
    tool = vimdiff
[mergetool]
    prompt = false
    keepBackup = false

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)