wip

2025-11-20 08:19:01 +00:00
parent b46e05fd71
commit f4df2ab6eb
3 changed files with 73 additions and 24 deletions
@@ -39,6 +39,9 @@
        editor = "nvim";
        pager = "delta";
      };
+      merge = {
+        conflictstyle = "zdiff3";
+      };
      commit = {
        template = "~/.config/git/commit-message.txt";
      };
@@ -47,6 +50,7 @@
      };
      delta = {
        navigate = true;
+        side-by-side = true;
      };
      "diff \"image\"" = {
        textconv = "mediainfo";