From a7652be58cad812463faacdeaff7436668528288 Mon Sep 17 00:00:00 2001
From: Benedikt Schesch <b.schesch@gmail.com>
Date: Mon, 6 May 2024 17:57:48 -0700
Subject: [PATCH] Add fake merge driver

---
 .github/workflows/small-test.yml |  2 ++
 run.sh                           | 10 ----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/small-test.yml b/.github/workflows/small-test.yml
index 3b3acc8ea7..c4e1f50f11 100644
--- a/.github/workflows/small-test.yml
+++ b/.github/workflows/small-test.yml
@@ -58,6 +58,8 @@ jobs:
       run: |
         git config --global user.email "example@example.com"
         git config --global user.name "Example Example"
+        git config --global merge.customMerge.name "Always incorrect custom merge driver"
+        git config --global merge.customMerge.driver 'fake-merge-driver %O %A %B %L %P'
         make small-test
       env:
           GITHUB_TOKEN: ${{ secrets.TOKEN_GITHUB }}
diff --git a/run.sh b/run.sh
index 994a84e45d..649dc5cf9f 100755
--- a/run.sh
+++ b/run.sh
@@ -63,16 +63,6 @@ else
     echo "Global config is empty"
 fi
 
-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"