Skip to content

Instantly share code, notes, and snippets.

@codeaholicguy

codeaholicguy/.gitconfig_difftool

Last active June 13, 2018 08:53
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save codeaholicguy/f012a8fcddefa45712c62e0ab25fedf9 to your computer and use it in GitHub Desktop.
Save codeaholicguy/f012a8fcddefa45712c62e0ab25fedf9 to your computer and use it in GitHub Desktop.
Download ZIP
Use nvim as difftool
Raw
.gitconfig_difftool
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $MERGED $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