Tweak git settings

benedikt-schesch · Sep 2, 2024 · d657e1e · d657e1e
1 parent 3f8a581
commit d657e1e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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