From 5d7ac0e061e7f2ba2acfb3b813c5e82e30590bc7 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Wed, 28 Aug 2024 21:53:35 +0900
Subject: feat(home/development): git: switch to zdiff3

---
 home/profiles/development/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'home')

diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index 15cec65..71cf3af 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -41,7 +41,7 @@ in
         init.defaultBranch = "main";
         pull.rebase = true;
 
-        merge.conflictStyle = "diff3";
+        merge.conflictStyle = "zdiff3";
 
         mergetool.fugitive = {
           cmd = ''nvim -f -c "Gvdiffsplit!" "$MERGED"'';
-- 
cgit 1.4.1