X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=home%2F.gitconfig;h=ba90195167455a23d23b70db22c59079b3ea07e9;hb=9abec9564cc578d04c2c2a93ca60977b5ae22122;hp=0fb589e4092cc487822e106feece8ca8418a7bbd;hpb=7af1572a011a62980ca75d66af35570b26845548;p=khome.git

diff --git a/home/.gitconfig b/home/.gitconfig
index 0fb589e..ba90195 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -15,3 +15,13 @@
 #	clean = git-lfs clean -- %f
 #	smudge = git-lfs smudge -- %f
 #	process = git-lfs filter-process
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+[mergetool]
+    prompt = false