diff --git a/run.sh b/run.sh index a005897ae4..6b0a4d8605 100755 --- a/run.sh +++ b/run.sh @@ -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."