Faster tests

backend/reconcile/src/operation_transformation.rs

@@ -120,23 +120,20 @@ mod test {
     #[ignore = "expensive to run, only run in CI"]
     #[test_matrix( [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
     ],  [
         "pride_and_prejudice.txt",
-        "romeo_and_juliet.txt",
         "room_with_a_view.txt",
         "kun_lu.txt",
         "blns.txt"
-    ], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000], [0..10000, 10000..20000, 20000..50000])]
+    ], [0..10000, 10000..20000], [0..10000, 10000..20000], [0..10000, 10000..20000])]
     fn test_merge_files_without_panic(
         file_name_1: &str,
         file_name_2: &str,

backend/reconcile/src/operation_transformation/edited_text.rs

@@ -240,7 +240,7 @@ where
                             Operation::Equal { index, .. } => index.to_string(),
                             Operation::Insert { text, .. } => text
                                 .iter()
-                                .map(super::super::tokenizer::token::Token::original)
+                                .map(crate::tokenizer::token::Token::original)
                                 .collect::<String>(),
                             Operation::Delete {
                                 deleted_character_count,

backend/reconcile/tests/examples/various.yml

@@ -122,3 +122,9 @@ parent: hello world
 left: hi, world
 right: hello my friend!
 expected: hi, my friend!
+
+---
+parent: a a
+left: a
+right: a
+expected: a