feat: cover more cases in ordered merge algorithm. (#5)

jpedroh · Oct 24, 2023 · d2ef14b · d2ef14b
1 parent bb79731
commit d2ef14b
Show file tree

Hide file tree

Showing 4 changed files with 707 additions and 421 deletions.
diff --git a/bin/src/main.rs b/bin/src/main.rs
@@ -62,6 +62,7 @@ pub fn pretty_print(node: CSTNode) -> String {
                 result
             })
         }
+        CSTNode::Conflict { .. } => "Conflict found".into(),
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,6 +62,7 @@ pub fn pretty_print(node: CSTNode) -> String { @@
                     result
                 })
             }
+            CSTNode::Conflict { .. } => "Conflict found".into(),
         }
     }
@@ Expand Down @@