Skip to content

Instantly share code, notes, and snippets.

@dteoh
Created March 17, 2019 23:40
  • Star 26 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
Star You must be signed in to star a gist
Save dteoh/ef407dd059125731d4afde33e05a232f to your computer and use it in GitHub Desktop.
Use Neovim as git mergetool
[merge]
tool = vimdiff
[mergetool]
keepBackup = false
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment