mirror of
https://github.com/nix-community/home-manager.git
synced 2026-06-05 21:02:51 +00:00
7519f615df
Adds Home Manager module for ec, a 3-way terminal native Git merge conflict resolver. The module supports: - Git integration by configuring ec as a mergetool.
13 lines
200 B
Plaintext
13 lines
200 B
Plaintext
[gpg]
|
|
format = "openpgp"
|
|
|
|
[gpg "openpgp"]
|
|
program = "@gnupg@/bin/gpg"
|
|
|
|
[merge]
|
|
tool = "ec"
|
|
|
|
[mergetool "ec"]
|
|
cmd = "@ec@/bin/ec \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
|
|
trustExitCode = true
|