Add broken test for merge conflict resolution order

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)
+    }
 }