From 9bf942e661dda139cbd471b16378be42bb32cf17 Mon Sep 17 00:00:00 2001
From: Arti Zirk <arti.zirk@gmail.com>
Date: Mon, 16 May 2022 16:18:37 +0300
Subject: [PATCH] Change git diff conflict style

---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitconfig b/.gitconfig
index 87907e8..766c77f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -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