Added test data

Makefile

@@ -134,7 +134,7 @@ clean-local:
 check-merges-reproducibility:
 	@echo "Running replay_merge for each idx in parallel using GNU Parallel..."
 	@set -e; \
-	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --merges_csv $(CSV_RESULTS) -delete_workdir --idx {}
+	tail -n +2 $(CSV_RESULTS) | awk -F, '{print $$1}' | parallel --halt now,fail=1 -j 50% python3 src/python/replay_merge.py --merges_csv $(CSV_RESULTS) -skip_build -delete_workdir --idx {}
 
 protect-repos:
 	find repos -mindepth 1 -type d -exec chmod a-w {} +

src/scripts/merge_tools/gitmerge_ort_adjacent.sh

@@ -9,9 +9,20 @@ branch2=$3
 export JAVA_HOME="$JAVA17_HOME"
 
 cd "$clone_dir" || exit 1
-if ! "$MERGE_SCRIPTS_DIR"/resolve-adjacent-conflicts; then
-  echo "gitmerge_ort_adjacent.sh: Conflict"
-  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" --only-adjacent'
+
+git merge --no-edit "$branch2"
+retVal=$?
+
+# report conflicts
+if [ "$retVal" -ne 0 ]; then
+    echo "Conflict"
 fi
 
 exit "$retVal"