Merge branch 'main' into update-import

Makefile

@@ -38,6 +38,7 @@ clean-cache:
 # This target deletes files in the test cache.
 clean-test-cache:
 	rm -rf cache-small
+	rm -f cache-small.tar
 
 # This target deletes files that are committed to version control.
 clean-stored-hashes:

run.sh

@@ -70,6 +70,19 @@ PATH=$(pwd)/src/scripts/merge_tools/:$PATH
 PATH=$(pwd)/src/scripts/merge_tools/merging/src/main/sh/:$PATH
 export PATH
 
+echo "Checking for custom merge drivers in global configuration..."
+merge_drivers=$(git config --global --get-regexp '^merge\..*\.driver$' || echo "No merge drivers set")
+
+if [ "$merge_drivers" == "No merge drivers set" ]; then
+    echo "No custom merge drivers found in global configuration. Proceeding with the evaluation."
+    # Include other commands to continue the script here
+else
+    echo "Error: Custom merge drivers are set in global configuration."
+    echo "Please unset them before running the evaluation."
+    echo "Merge driver found: $merge_drivers"
+    exit 1
+fi
+
 # Check if cache.tar exists and cache is missing
 if [ -f cache.tar ] && [ ! -d cache ]; then
     echo "Decompressing cache.tar"