⚠️ This repository is archived. The feature has been merged into Neovim.

difftool

DiffTool <left> <right> command for integration with git difftool and git difftool --dir-diff.

Config

{
    method = 'auto', -- diff method to use, 'auto', 'builtin' or 'diffr'
    rename = {
        detect = false, -- whether to detect renames, can be slow on large directories
        similarity = 0.5, -- minimum similarity for rename detection
        chunk_size = 4096, -- maximum chunk size for rename detection
    }
}

There are also vim.g config options:

vim.g.difftool_replace_diff_mode = false -- false by default, if true replaces nvim -d with DiffTool

Usage

Add this to your gitconfig:

[diff]
    tool = nvim_difftool

[difftool "nvim_difftool"]
    cmd = nvim -c \"DiffTool $LOCAL $REMOTE\"

Or if you enabled difftool_replace_diff_mode:

[diff]
    tool = nvimdiff