From ae06102731e2c7add93f02a4a93b2cbf57250ac7 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Thu, 17 Mar 2022 17:30:31 +0900
Subject: Revert "feat(home/development): use diff3 on conflict"

This reverts commit af2fa4a9d6ed7204a1f253c6ad6fc695f9a121f0.
---
 home/profiles/development/default.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'home')

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