feat(git): Use Ediff

This commit is contained in:
Madeleine Sydney authored and Madeleine Sydney Ślaga committed 2025-05-28 23:31:41 -06:00
1 parent f173ab4c0b
commit 6b26b5c47f
2 files changed
+72

No files matched your search

+13
View File
@@ -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 = {