mirror of
https://github.com/nix-community/home-manager.git
synced 2025-04-13 15:57:47 +00:00
d8b4ba070f
This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.
1 line
17 B
Text
1 line
17 B
Text
* merge=mergiraf
|