Set vimdiff as default git merge tool

diff --git a/home/.gitconfig b/home/.gitconfig
index fcd0539..ba90195 100644 (file)
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -20,3 +20,8 @@
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    prompt = false