From 3916b48eb1b80ce791107f316582a75a9e8346e7 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Mon, 21 Nov 2022 16:44:26 +0000
Subject: Remove git merge config

---
 nix-conf/home/includes/common.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'nix-conf')

diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix
index 8d58312..971aa7d 100644
--- a/nix-conf/home/includes/common.nix
+++ b/nix-conf/home/includes/common.nix
@@ -204,10 +204,6 @@ in
         prompt = false;
         difftastic = { cmd = ''difft "$LOCAL" "$REMOTE"''; };
       };
-      merge = {
-        conflictstyle = "diff3";
-        ff = "only";
-      };
       pull = {
         ff = "only";
         rebase = false;
-- 
cgit 1.4.1-2-gfad0