GitoxideLabs
diff --git a/‎Cargo.lock
+2 b/‎Cargo.lock
+2
diff --git a/‎gix-merge/Cargo.toml
+4 b/‎gix-merge/Cargo.toml
+4
diff --git a/‎gix-merge/src/blob/builtin_driver.rs
+733-20 b/‎gix-merge/src/blob/builtin_driver.rs
+733-20
diff --git a/‎gix-merge/src/blob/platform.rs
+1-1 b/‎gix-merge/src/blob/platform.rs
+1-1
diff --git a/‎gix-merge/tests/fixtures/generated-archives/text-baseline.tar
199 KB b/‎gix-merge/tests/fixtures/generated-archives/text-baseline.tar
199 KB
@@ -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"]
@@ -137,7 +137,7 @@ pub mod merge {
         pub other: ResourceRef<'parent>,
     }
 
-    #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]
+    #[derive(Copy, Clone, Debug, Eq, PartialEq)]
     pub struct Options {
         /// If `true`, the resources being merged are contained in a virtual ancestor,
         /// which is the case when merge bases are merged into one.
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ pub mod merge {`
`137`	`137`	`pub other: ResourceRef<'parent>,`
`138`	`138`	`}`
`139`	`139`
`140`		`- #[derive(Copy, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash)]`
	`140`	`+ #[derive(Copy, Clone, Debug, Eq, PartialEq)]`
`141`	`141`	`pub struct Options {`
`142`	`142`	/// If `true`, the resources being merged are contained in a virtual ancestor,
`143`	`143`	`/// which is the case when merge bases are merged into one.`