add the gix-merge crate for capturing merge algorithms

Author: Byron

Cargo.lock

@@ -243,6 +243,7 @@ members = [
     "gix-object",
     "gix-glob",
     "gix-diff",
+    "gix-merge",
     "gix-date",
     "gix-traverse",
     "gix-dir",

Cargo.toml

@@ -130,10 +130,11 @@ is usable to some extent.
   * [gix-submodule](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-submodule)
   * [gix-status](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-status)
   * [gix-worktree-state](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-worktree-state)
-  * `gitoxide-core`
-* **very early**  _(possibly without any documentation and many rough edges)_
   * [gix-date](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-date)
   * [gix-dir](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-dir)
+  * `gitoxide-core`
+* **very early**  _(possibly without any documentation and many rough edges)_
+  * [gix-merge](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-merge)
 * **idea** _(just a name placeholder)_
   * [gix-note](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-note)
   * [gix-fetchhead](https://github.com/Byron/gitoxide/blob/main/crate-status.md#gix-fetchhead)

README.md

@@ -326,6 +326,15 @@ Check out the [performance discussion][gix-diff-performance] as well.
 * [ ] working with hunks of data
 * [x] API documentation
     * [ ] Examples
+
+### gix-merge
+
+* [ ] three-way merge analysis of blobs with choice of how to resolve conflicts
+    - [ ] choose how to resolve conflicts on the data-structure
+    - [ ] produce a new blob based on data-structure containing possible resolutions
+        - [ ] `merge` style
+        - [ ] `diff3` style
+        - [ ] `zdiff` style
 
 [gix-diff-performance]: https://github.com/Byron/gitoxide/discussions/74
 

crate-status.md

@@ -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 <[email protected]>"]
+edition = "2021"
+rust-version = "1.65"
+
+[lints]
+workspace = true
+
+[lib]
+doctest = false
+
+[dependencies]
+

gix-merge/Cargo.toml

@@ -0,0 +1 @@
+../LICENSE-APACHE

gix-merge/LICENSE-APACHE

@@ -0,0 +1 @@
+../LICENSE-MIT

gix-merge/LICENSE-MIT

@@ -0,0 +1,2 @@
+#![deny(rust_2018_idioms)]
+#![forbid(unsafe_code)]