From 0cd7b63ff51ba21af3f1e5dca8a60a653e8e20c2 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Fri, 25 Aug 2023 22:48:37 +0200
Subject: Feat(hm/conf/git): Mark moved code in diffs and delta for merge
 conflicts

---
 home-manager/soispha/config/git/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'home-manager/soispha/config')

diff --git a/home-manager/soispha/config/git/default.nix b/home-manager/soispha/config/git/default.nix
index 9e15da1d..cc505832 100644
--- a/home-manager/soispha/config/git/default.nix
+++ b/home-manager/soispha/config/git/default.nix
@@ -55,6 +55,12 @@ in {
       commit = {
         template = "${gitTemplateFile}";
       };
+      diff = {
+        colorMoved = "default";
+      };
+      merge = {
+        conflictstyle = "diff3";
+      };
     };
     delta = {
       enable = true;
-- 
cgit 1.4.1