Updated aliases for spv

2018-06-29 21:21:56 -04:00
parent 9fcf0867a6
commit 90d957e0ec
5 changed files with 40 additions and 19 deletions
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -7,3 +7,8 @@
 	editor = nvim
 [push]
 	default = simple
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false