1 files changed, 0 insertions, 4 deletions
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;