From 22dc0efc112aab7cccac887151a9b47bf06cb1d7 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <git@yannherklotz.com>
Date: Sun, 27 Feb 2022 18:29:45 +0000
Subject: Add better conflict resolution to git config

---
 git/.gitconfig | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'git')

diff --git a/git/.gitconfig b/git/.gitconfig
index ea6c0eb..61ee177 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -16,3 +16,9 @@
 
 [commit]
 	gpgsign = true
+
+[merge]
+	conflictstyle = diff3
+
+[credential]
+	helper = store
-- 
cgit