dotfiles

commit 303e508be36b30a1747a211812fcb745d86de5f3
parent a71a8bafc32d4d0a034fb4650c297959b5e896a1
Author: Ed van Bruggen <edvb54@gmail.com>
Date:   Fri, 14 Jul 2017 22:42:29 -0700

Add vimdiff git mergetool

Diffstat:
gitconfig
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/gitconfig b/gitconfig
@@ -2,7 +2,7 @@
 	email = edvb54@gmail.com
 	name = Ed van Bruggen
 [github]
-	user = edvb54
+	user = edvb
 [push]
 	default = matching
 [help]
@@ -28,6 +28,7 @@
 	p = push
 [pager]
 	diff = diff-highlight | less
-
 [credential]
 	helper = cache --timeout=43200
+[merge]
+	tool = vimdiff