Merge branch 'main' into merge/docker

utils/sops-mergetool.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Exit on first error and verify variables have been set/passed via CLI
-set -eu
+#set -eu
 set -v
 set -x
 
@@ -8,6 +8,11 @@ set -x
 # https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver
 base="$1"; local_="$2"; remote="$3"; merged="$4"
 
+echo "$base"
+echo "$local_"
+echo "$remote"
+echo "$merged"
+
 # Resolve our default mergetool
 # https://github.com/git/git/blob/v2.8.2/git-mergetool--lib.sh#L3
 mergetool="$(git config --get merge.tool)"