1 files changed, 2 insertions, 0 deletions

diff --git a/.gitconfig b/.gitconfig
index b882e2d..1455c11 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -8,3 +8,5 @@
 	gpgsign = true
 [gpg]
 	program = gpg
+[merge]
+	tool = vimdiff