From 00a8ec71f5c1436726982e7c564b484ff7fc2cc5 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Sun, 7 Apr 2024 19:28:44 +0200
Subject: [PATCH] [misc] Upgrade jgit to 6.9.0.202403050737-r (#509)

* Upgrade jgit to 6.9.0.202403050737-r

Fixes #487.

* Remove LineBasedMergeTest
---
 pom.xml                                             | 2 +-
 src/main/kotlin/se/kth/spork/util/LineBasedMerge.kt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c198bf0b..640b9bdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
-            <version>6.3.0.202209071007-r</version>
+            <version>6.9.0.202403050737-r</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
diff --git a/src/main/kotlin/se/kth/spork/util/LineBasedMerge.kt b/src/main/kotlin/se/kth/spork/util/LineBasedMerge.kt
index c10b34b6..d0c1e5a4 100644
--- a/src/main/kotlin/se/kth/spork/util/LineBasedMerge.kt
+++ b/src/main/kotlin/se/kth/spork/util/LineBasedMerge.kt
@@ -63,6 +63,10 @@ fun lineBasedMerge(base: String, left: String, right: String): Pair<String, Int>
                 inConflict = true
             }
             lines.add(SporkPrettyPrinter.MID_CONFLICT)
+        } else if (chunk.conflictState
+            == MergeChunk.ConflictState.BASE_CONFLICTING_RANGE
+        ) {
+            continue
         }
         for (i in chunk.begin until chunk.end) {
             lines.add(seq.getString(i))