From bb9ef66f98ffaa881a6ee6ce1f73b85da6d052da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 20 Aug 2022 14:20:30 +0200
Subject: [PATCH] :rocket: use diff3 by default

---
 modules/programs/git.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/programs/git.nix b/modules/programs/git.nix
index fdb3de8..9521b17 100644
--- a/modules/programs/git.nix
+++ b/modules/programs/git.nix
@@ -40,7 +40,10 @@ in
         enable = true;
         userName = "Moritz Böhme";
         userEmail = "mail@moritzboeh.me";
-        extraConfig.init.defaultBranch = "main";
+        extraConfig = {
+          init.defaultBranch = "main";
+          merge.conflictstyle = "diff3";
+        };
         delta.enable = true;
         signing = mkIf cfg.signing {
           key = "0x970C6E89EB0547A9";