This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts. |
||
|---|---|---|
| .. | ||
| integration | ||
| lib | ||
| modules | ||
| asserts.nix | ||
| big-test.nix | ||
| default.nix | ||
| flake.nix | ||
| stubs.nix | ||
This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts. |
||
|---|---|---|
| .. | ||
| integration | ||
| lib | ||
| modules | ||
| asserts.nix | ||
| big-test.nix | ||
| default.nix | ||
| flake.nix | ||
| stubs.nix | ||