vim mergetool setting

anund · Jan 5, 2016 · ff3547a · ff3547a
1 parent d755d56
commit ff3547a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/git/gitconfig b/git/gitconfig
@@ -5,3 +5,5 @@
 	name = Anund
 [push]
 	default = simple
+[merge]
+	tool = vimdiff