X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=git%2F.gitconfig;h=f947858758ae208b5e8bfe8b2d8ae13476776e67;hb=109f0f1e4e4288c2e8d2c880de8f37963526a4b0;hp=b3d796fd5889cee173806688567889e9e3d31a89;hpb=ab54e0aee377aa486eea0c46da6577437b6d54e1;p=dotfiles.git

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