[misc] Upgrade jgit to 6.9.0.202403050737-r (#509)

* Upgrade jgit to 6.9.0.202403050737-r Fixes #487. * Remove LineBasedMergeTest
ASSERT-KTH · Apr 7, 2024 · 00a8ec7 · 00a8ec7
1 parent 29f187f
commit 00a8ec7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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))