From 29bb0340b7e1205657423d5a85d8b612298a3152 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Fri, 25 Oct 2024 12:51:24 +0100
Subject: Try diff3 conflict style again

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

(limited to 'nix-conf')

diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index acae580..17d9a0d 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -329,6 +329,7 @@ in
           cmd = ''difft "$LOCAL" "$REMOTE"'';
         };
       };
+      merge.conflictstyle = "diff3";
       pull = {
         ff = "only";
         rebase = false;
-- 
cgit 1.4.1-2-gfad0