mirror of
https://github.com/nix-community/home-manager.git
synced 2025-12-07 17:41:03 +01:00
This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts. |
||
|---|---|---|
| .. | ||
| basic-configuration.nix | ||
| default.nix | ||
| mergiraf-git-attributes.conf | ||
| mergiraf-git.conf | ||