Add syntastic plugin, tweak list settings, register git difftool

2017-08-30 14:13:05 -07:00
parent 77365899bd
commit 4b1d3c04c7
2 changed files with 21 additions and 2 deletions
@@ -1,7 +1,16 @@
 [user]
 	name = Andrew Miner
-	email = andrewminer@mac.com
+	email = aminer@looker.com
 [pull]
    rebase = true
 [push]
 	default = simple
+[merge]
+	tool = gvimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
+[diff]
+	tool = gvimdiff
+[difftool]
+	prompt = false