mirror of
https://github.com/nix-community/home-manager.git
synced 2025-04-14 00:07:15 +00:00
d8b4ba070f
This adds git integration for mergiraf. It sets up git to use mergiraf to automatically resolve merge conflicts.
9 lines
198 B
Text
9 lines
198 B
Text
[gpg]
|
|
format = "openpgp"
|
|
|
|
[gpg "openpgp"]
|
|
program = "@gnupg@/bin/gpg"
|
|
|
|
[merge "mergiraf"]
|
|
driver = "@mergiraf@/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L"
|
|
name = "mergiraf"
|