From f0a983c52dfc9e95e56f06fb86026a11ed44083b Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 22 Nov 2023 15:02:05 +0100
Subject: [PATCH] Set git to use fancy conflict style with 3-way diffs

---
 home/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/common.nix b/home/common.nix
index ad43c9b..95a0e92 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -150,6 +150,7 @@ in
           .envrc
           .kakrc
         ''}";
+        merge.conflictstyle = "diff3";
       };
     };