Skip to content

Instantly share code, notes, and snippets.

@scottshane

scottshane/vim mergetool config

Last active February 13, 2020 00:53
Show Gist options
  • Save scottshane/be78bb3941a2c5807bdc8aba402f5f32 to your computer and use it in GitHub Desktop.
Save scottshane/be78bb3941a2c5807bdc8aba402f5f32 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
vim mergetool config
# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
tool = nvim
# automatically launch merge tool without displaying a prompt
[mergetool]
prompt = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment