diff --git a/Cargo.lock b/Cargo.lock index 324c1919ee3..7da72e3228f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1612,8 +1612,7 @@ dependencies = [ "gix-trace", "gix-traverse", "gix-worktree", - "imara-diff 0.1.8", - "imara-diff 0.2.0", + "imara-diff", "serde", "thiserror 2.0.17", ] @@ -1905,7 +1904,7 @@ dependencies = [ "gix-trace", "gix-utils", "gix-worktree", - "imara-diff 0.1.8", + "imara-diff", "pretty_assertions", "serde", "termtree", @@ -2907,15 +2906,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "imara-diff" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17d34b7d42178945f775e84bc4c36dde7c1c6cdfea656d3354d009056f2bb3d2" -dependencies = [ - "hashbrown 0.15.5", -] - [[package]] name = "imara-diff" version = "0.2.0" diff --git a/gix-diff/Cargo.toml b/gix-diff/Cargo.toml index d03bca70c44..d0a1601c78f 100644 --- a/gix-diff/Cargo.toml +++ b/gix-diff/Cargo.toml @@ -55,7 +55,7 @@ gix-trace = { version = "^0.1.15", path = "../gix-trace", optional = true } gix-traverse = { version = "^0.49.0", path = "../gix-traverse", optional = true } thiserror = "2.0.17" -imara-diff = { version = "0.1.8", optional = true } +imara-diff = { version = "0.2.0", optional = true } imara-diff-v2 = { version = "0.2.0", optional = true, package = "imara-diff" } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } getrandom = { version = "0.2.8", optional = true, default-features = false, features = ["js"] } diff --git a/gix-merge/Cargo.toml b/gix-merge/Cargo.toml index 017b2500fdc..e2fbfe95bcb 100644 --- a/gix-merge/Cargo.toml +++ b/gix-merge/Cargo.toml @@ -35,7 +35,7 @@ gix-diff = { version = "^0.55.0", path = "../gix-diff", default-features = false gix-index = { version = "^0.43.0", path = "../gix-index" } thiserror = "2.0.17" -imara-diff = { version = "0.1.8" } +imara-diff = { version = "0.2.0" } bstr = { version = "1.12.0", default-features = false } serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }