From bc21047420ef7dfefd9ce255ae078db067e697f3 Mon Sep 17 00:00:00 2001
From: Michael Mandl <michael.mandl@horsch.com>
Date: Wed, 26 Feb 2025 08:23:04 +0100
Subject: [PATCH] feat(git): show merge conflicts in 3-way style

---
 git/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/git/default.nix b/git/default.nix
index 1b18073..b901b27 100644
--- a/git/default.nix
+++ b/git/default.nix
@@ -62,8 +62,11 @@
 
         log.date = "relative";
 
-        merge.ff = false;
-        merge.tool = "nvim";
+        merge = {
+          conflictstyle = "zdiff3";
+          ff = false;
+          tool = "nvim";
+        };
 
         mergetool.nvim.cmd = "nvim -d $BASE $LOCAL $REMOTE $MERGED -c 'DiffviewOpen'";
         mergetool.nvim.trustExitCode = false;