]> Sergey Matveev's repositories - dotfiles.git/commitdiff
projects / dotfiles.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3f1626a)
Let's try to use zdiff3
authorSergey Matveev <stargrave@stargrave.org>
Wed, 26 Jan 2022 17:14:54 +0000 (20:14 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Thu, 27 Jan 2022 11:35:14 +0000 (14:35 +0300)
git/.gitconfig patch | blob | history

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]
Stargrave's dotfiles