Switch git to zdiff3 algo

2 years ago · 7d6c4f1fcb
1 changed files with 1 additions and 1 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -3,7 +3,7 @@
				@@ -3,7 +3,7 @@
 	email = arti.zirk@gmail.com
 [merge]
 	tool = meld
-	conflictstyle = diff3
+	conflictStyle = zdiff3

 [alias]
 	plog = log --graph --pretty=format:'%h -%d %s %n' --abbrev-commit --date=relative --branches