From 9ad6527d69a5dd5fb1264c0a958908f45da7f3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Av=C3=A9?= <email@thomasave.be>
Date: Mon, 14 Jul 2025 17:44:54 +0200
Subject: [PATCH] Lazygit update

---
 home/git/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/git/default.nix b/home/git/default.nix
index c3070e0f..40f12323 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -34,6 +34,7 @@
         settings = {
             os = {
                 editPreset = "nvim";
+                autoStageResolvedConflicts = false;
             };
         };
     };