Skip to content

Commit

Permalink
Check for bug in git ci/cd
Browse files Browse the repository at this point in the history
  • Loading branch information
benedikt-schesch committed Apr 29, 2024
1 parent cb1be10 commit c81d8ff
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ done
PATH=$(pwd)/src/scripts/merge_tools/:$PATH
export PATH

echo "Checking for custom merge drivers in global configuration..."
merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$')
if [ -n "$merge_drivers" ]; then
echo "Error: Custom merge drivers are set in global configuration."
Expand Down

0 comments on commit c81d8ff

Please sign in to comment.