From 74ad2caf32fc35dcb6e7117c4b1b349ed7a7a545 Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Thu, 2 Apr 2020 11:57:18 -0400
Subject: git merge conflictstyle diff3

why is this not the default
---
 home/home.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/home.nix b/home/home.nix
index 871b82009446..92632913dcfd 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -79,6 +79,7 @@ let machine = ./machines/chupacabra.nix; in
     userName  = "Griffin Smith";
     extraConfig = {
       github.user = "glittershark";
+      merge.conflictstyle = "diff3";
     };
   };
 
-- 
cgit 1.4.1