From 6a67a4e840a0c91ff8beaffbca85555751f137aa Mon Sep 17 00:00:00 2001
From: anzhu <avzhur0@gmail.com>
Date: Sat, 16 Sep 2023 19:05:31 +0300
Subject: [PATCH] Add broken test for merge conflict resolution order

---
 src/commonTest/kotlin/testMerge.kt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/commonTest/kotlin/testMerge.kt b/src/commonTest/kotlin/testMerge.kt
index c356fca..9fe09fa 100644
--- a/src/commonTest/kotlin/testMerge.kt
+++ b/src/commonTest/kotlin/testMerge.kt
@@ -144,4 +144,15 @@ class BasicTest {
         println(result.merged.str)
         assertTrue(false)
     }
+
+    @Test
+    fun testMergeConflictOrder() {
+        val source = "ABAB".toList()
+        val our = "ACAC".toList()
+        val their = "ADAD".toList()
+
+        val result = merge3(source, their, our)
+        println(result.merged.str)
+        assertTrue(false)
+    }
 }
\ No newline at end of file