1 files changed, 6 insertions, 0 deletions
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;