From 9784f4bd54cf460a9012f5400b37ae590d1cce20 Mon Sep 17 00:00:00 2001
From: Glen Goodwin <glen.goodwin1992@gmail.com>
Date: Fri, 10 Nov 2023 00:11:11 -0500
Subject: [PATCH] fix: update merge section in git config

---
 modules/shell/git/home.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/shell/git/home.nix b/modules/shell/git/home.nix
index 1085b05..b745594 100644
--- a/modules/shell/git/home.nix
+++ b/modules/shell/git/home.nix
@@ -10,9 +10,6 @@
     userName = "Glen Goodwin";
     userEmail = "glen.goodwin1992@gmail.com";
     extraConfig = {
-      merge = {
-        ff = "only";
-      };
       diff = {
         algorithm = "patience";
         compactionHeuristic = "true";