1 files changed, 2 insertions, 0 deletions

diff --git a/.gitconfig b/.gitconfig
index d582072..056e73c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,3 +6,5 @@
 	ff = only
 [commit]
 	gpgsign = true
+[merge]
+	tool = vimdiff