Implement text and binary merge algorithms, also with baseline te…

…sts for correctness.
Byron · Sep 15, 2024 · 5df4341 · 5df4341
1 parent b96d11f
commit 5df4341
Show file tree

Hide file tree

Showing 9 changed files with 618 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml
@@ -39,6 +39,10 @@ serde = { version = "1.0.114", optional = true, default-features = false, featur
 
 document-features = { version = "0.2.0", optional = true }
 
+[dev-dependencies]
+gix-testtools = { path = "../tests/tools" }
+pretty_assertions = "1.4.0"
+
 [package.metadata.docs.rs]
 all-features = true
 features = ["document-features"]