Skip to content

Instantly share code, notes, and snippets.

@kmaglione
Created August 9, 2016 03:04
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 kmaglione/3cebc5d67d2efe98443faae97ffe4c62 to your computer and use it in GitHub Desktop.
Save kmaglione/3cebc5d67d2efe98443faae97ffe4c62 to your computer and use it in GitHub Desktop.
vimdiff.executable = nvim
vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable write"
vimdiff.premerge = keep
vimdiff.priority = 100
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment