This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.
1 line
62 B
Nix
1 line
62 B
Nix
{ mergiraf-basic-configuration = ./basic-configuration.nix; }
|