Let's try to use zdiff3

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index b3d796fd5889cee173806688567889e9e3d31a89..f947858758ae208b5e8bfe8b2d8ae13476776e67 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -37,6 +37,7 @@
        lineNumber = true
 [merge]
        tool = vimdiff
+       conflictStyle = zdiff3
 [pull]
        ff = only
 [help]