[gpg] format = "openpgp" [gpg "openpgp"] program = "@gnupg@/bin/gpg" [merge] tool = "ec" [mergetool "ec"] cmd = "@ec@/bin/ec \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"" trustExitCode = true