Skip to content

Instantly share code, notes, and snippets.

@sw-samuraj

sw-samuraj/vimdiff-gitconfig.properties

Last active November 6, 2017 08:49
Show Gist options
  • Save sw-samuraj/635bf7257453170fbed6061246db9642 to your computer and use it in GitHub Desktop.
Save sw-samuraj/635bf7257453170fbed6061246db9642 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
vimdiff-gitconfig.properties
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment