X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2F.gitconfig;h=ba90195167455a23d23b70db22c59079b3ea07e9;hb=af4a2d18746a6cd9c9cbcd3006dd735468363c70;hp=fcd0539471525bc7d8642fdf1c6bc5405c994aa2;hpb=acf35a38d612c6fd7ec4db021ec87784a9fb7d43;p=khome.git

diff --git a/home/.gitconfig b/home/.gitconfig
index fcd0539..ba90195 100644
--- 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