initial commit: some diff algorithm

src/jvmTest/kotlin/testMerge.kt

@@ -0,0 +1,49 @@
+import net.sergeych.merge3.merge3
+import net.sergeych.mp_logger.Log
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+val List<Char>.str: String get() = joinToString("")
+
+class BasicTest {
+    @Test
+    fun testMergeNoConflicts() {
+        val src = "Hello world".toList()
+        val a = "Hello cruel world!".toList()
+        val b = "Bye world!!".toList()
+
+        val m = merge3(src, b, a)
+        println(m.merged.str)
+//        println(m.conflicts)
+        println(m.changedAreas)
+        assertEquals("Bye cruel world!!!", m.merged.str)
+//        assertTrue(m.noConflicts)
+    }
+
+    @Test
+    fun testMergeNoConflicts2() {
+        val src = "Hello world".toList()
+        val a = "Hello friend".toList()
+        val b = "Bye world".toList()
+
+        val m = merge3(src, b, a)
+        println(m.merged.str)
+//        println(m.conflicts)
+        println(m.changedAreas)
+        assertEquals("Bye friend", m.merged.str)
+//        assertTrue(m.noConflicts)
+    }
+    @Test
+    fun testMergeWithConflicts() {
+        Log.connectConsole()
+        val src = "Hello world".toList()
+        val a = "Hello 123".toList()
+        val b = "Hello 456".toList()
+
+        val m = merge3(src, b, a, false)
+        println(m.merged.str)
+//        println(m.conflicts)
+        println(m.changedAreas)
+        assertEquals("Hello 123456", m.merged.str)
+    }
+}