From d657e1e66c976e6d1b27f98042ed4e57291fbf4d Mon Sep 17 00:00:00 2001 From: Michael Ernst Date: Mon, 2 Sep 2024 09:59:33 -0700 Subject: [PATCH] Tweak git settings --- src/scripts/merge_tools/gitmerge.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/merge_tools/gitmerge.sh b/src/scripts/merge_tools/gitmerge.sh index 0949f1d409..d32e741299 100755 --- a/src/scripts/merge_tools/gitmerge.sh +++ b/src/scripts/merge_tools/gitmerge.sh @@ -24,7 +24,8 @@ git_strategy=$4 cd "$clone_dir" || (echo "$0: cannot cd to $clone_dir" ; exit 1) git checkout "$branch1" --force -git config merge.conflictstyle zdiff3 +git config --local merge.conflictstyle zdiff3 +git config --local mergetool.prompt false echo "Running: git merge --no-edit $git_strategy $branch2" # shellcheck disable=SC2086