This commit is contained in:
Trolli Schmittlauch 2025-04-27 16:09:02 +02:00
parent b178274fe3
commit be859336b3

View file

@ -51,7 +51,9 @@
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt` # provide `git mergetool -t nixfmt`
mergetool.nixfmt = { mergetool.nixfmt = {
cmd = "${lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""; cmd = "${
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true; trustExitCode = true;
}; };
core.excludesfile = toString ( core.excludesfile = toString (