Skip to content

Instantly share code, notes, and snippets.

@arcseldon
Forked from huytd/.gitconfig
Created Mar 21, 2019
Embed
What would you like to do?
Use neovim as diff tool
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[diff]
tool = vimdiff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment