From 94f9caf21d40f079bcde46eab74e649c11dca76a Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Fri, 18 Mar 2022 06:55:47 +0900
Subject: Revert "Revert "feat(home/development): use diff3 on conflict""

This reverts commit 0655c7c41c2081cf8056c1f65b257a7fedf9f6d4.
---
 home/profiles/development/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'home')

diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index aaf7878..4202f53 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -37,6 +37,7 @@ in
         init.defaultBranch = "main";
         pull.rebase = true;
 
+        merge.conflictStyle = "diff3";
         merge.tool = "nvimdiff";
         mergetool.prompt = false;
       };
-- 
cgit 1.4.1