feat(git): Use Ediff

2025-05-06 11:35:47 -06:00
parent f173ab4c0b
commit 6b26b5c47f
2 changed files with 72 additions and 0 deletions
--- a/modules/home/users/crumb/git.nix
+++ b/modules/home/users/crumb/git.nix
@@ -21,6 +21,19 @@ in {
          enable = true;
          userEmail = my-email;
          userName = my-name;
+          extraConfig = {
+            diff = {
+              tool = "ediff";
+              guitool = "ediff";
+            };
+            difftool.ediff.cmd =
+              "${../../../../scripts/ediff/ediff} $LOCAL $REMOTE $MERGED";
+            merge.tool = "ediff";
+            mergetool.ediff = {
+              cmd = "${../../../../scripts/ediff/ediff} $LOCAL $REMOTE $MERGED";
+              trustExitCode = true;
+            };
+          };
        };

        home.shellAliases = {