From c57c8b74433ba2a176a1ff447e26dfee5b8ed87f Mon Sep 17 00:00:00 2001
From: Michael Ernst <mernst@cs.washington.edu>
Date: Tue, 4 Jun 2024 08:55:17 -0700
Subject: [PATCH] Remove stray `gitmerge_ort_imports.sh` file

---
 gitmerge_ort_imports.sh | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100755 gitmerge_ort_imports.sh

diff --git a/gitmerge_ort_imports.sh b/gitmerge_ort_imports.sh
deleted file mode 100755
index 0cdda305fc..0000000000
--- a/gitmerge_ort_imports.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env sh
-
-# usage: ./gitmerge_ort_imports.sh <clone_dir> <branch-1> <branch-2>
-
-clone_dir=$1
-branch1=$2
-branch2=$3
-
-export JAVA_HOME="$JAVA17_HOME"
-
-cd "$clone_dir" || exit 1
-
-git checkout "$branch1" --force
-
-attributes_file=".git/info/attributes"
-echo "*.java merge=merge-java" >> "$attributes_file"
-git config --local merge.merge-java.name "Merge Java files"
-git config --local merge.merge-java.driver 'java-merge-driver.sh "%A" "%O" "%B"'
-
-git merge --no-edit "$branch2"
-retVal=$?
-
-# report conflicts
-if [ "$retVal" -ne 0 ]; then
-    echo "Conflict"
-fi
-
-exit "$retVal"