exted plugin is convenient anyway

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796fd5889cee173806688567889e9e3d31a89..31d95a546a1220120e44f9302e2a229de834740e 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,6 +37,7 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+       conflictStyle = zdiff3
 [pull]
        ff = only
 [help]
@@ -45,3 +46,5 @@
        defaultBranch = master
 [format]
        useAutoBase = true
+[include]
+       path = /home/stargrave/.git-safe