Change git diff conflict style

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

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