add the gix-merge crate for capturing merge algorithms

Byron · Byron · commit 6017c087ec2e · 2024-08-30T09:57:05.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -243,6 +243,7 @@ members = [
     "gix-object",
     "gix-glob",
     "gix-diff",
+    "gix-merge",
     "gix-date",
     "gix-traverse",
     "gix-dir",
diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "gix-merge"
+version = "0.0.0"
+repository = "https://github.com/Byron/gitoxide"
+license = "MIT OR Apache-2.0"
+description = "A crate of the gitoxide project implementing merge algorithms"
+authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
+edition = "2021"
+rust-version = "1.65"
+
+[lints]
+workspace = true
+
+[lib]
+doctest = false
+
+[dependencies]
+
diff --git a/gix-merge/LICENSE-APACHE b/gix-merge/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
diff --git a/gix-merge/LICENSE-MIT b/gix-merge/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
diff --git a/gix-merge/src/lib.rs b/gix-merge/src/lib.rs
@@ -0,0 +1,2 @@
+#![deny(rust_2018_idioms)]
+#![forbid(unsafe_code)]
