git-mergetool
Visual conflict resolution tool
TLDR
Run merge tool
$ git mergetool
Use specific tool$ git mergetool --tool=[vimdiff]
Resolve specific file$ git mergetool [file.txt]
Don't prompt$ git mergetool --no-prompt
Use configured tool$ git mergetool -y
SYNOPSIS
git mergetool [options] [file]
DESCRIPTION
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.
PARAMETERS
FILE
Specific file to resolve.--tool TOOL
Use specified merge tool.--tool-help
List available tools.-y, --no-prompt
Don't prompt before each file.--prompt
Prompt before each file.-g, --gui
Use `merge.guitool` instead of `merge.tool`.--help
Display help information.
CONFIGURATION
~/.gitconfig
Configure default merge tool and tool-specific settings.
$ [merge]
tool = vimdiff
[mergetool]
prompt = false
keepBackup = false
tool = vimdiff
[mergetool]
prompt = false
keepBackup = false
INSTALL
sudo apt install git
sudo dnf install git
sudo pacman -S git
sudo apk add git
sudo zypper install git
brew install git
nix profile install nixpkgs#git
CAVEATS
Requires configured merge tool. Creates .orig backup files. Some tools need installation.
HISTORY
git mergetool is a core Git command providing integration with external merge tools, essential for complex conflict resolution.
SEE ALSO
git-merge(1), git-difftool(1), vimdiff(1)