From 16cc033c26a8c26d66db4a18eb6d0c50636be36f Mon Sep 17 00:00:00 2001
From: Jeremy Kaplan <jdkaplan@metagram.net>
Date: Tue, 16 Jan 2018 21:08:50 -0800
Subject: [PATCH] git conflict style

---
 git/config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git/config b/git/config
index edc0cbc..bb5a9cc 100644
--- a/git/config
+++ b/git/config
@@ -25,3 +25,5 @@
 
 [includeIf "gitdir:~/projects/"]
 	path = config-personal
+[merge]
+	conflictStyle = diff3