From a7a2b00707bd06dc38d8f9d89c2189f03fd3b27a Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@gwairfelin.com>
Date: Fri, 3 Oct 2025 10:18:38 +0100
Subject: [PATCH] Set ff = false

---
 home/dot_config/git/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/dot_config/git/config b/home/dot_config/git/config
index a694e02..8485294 100644
--- a/home/dot_config/git/config
+++ b/home/dot_config/git/config
@@ -41,7 +41,7 @@
     path = /home/max/.config/git/config-esl
 [merge]
     conflictStyle = zdiff3
-    ff = true
+    ff = false
     tool = vimdiff
 [mergetool "vimdiff"]
     cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'