contrib/merge-lists/Cargo.toml
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 23 Feb 2023 04:36:19 +0100
changeset 50190 34db5692d537
parent 49010 681b25ea579e
child 50806 337bc83c1275
permissions -rw-r--r--
narrow: open the transaction sooner when unbundling That way, the narrow spec changes will be done within a transaction.

# A tool that performs a 3-way merge, resolving conflicts in sorted lists and
# leaving other conflicts unchanged. This is useful with Mercurial's support
# for partial merge tools (configured in `[partial-merge-tools]`).

[package]
name = "merge-lists"
version = "0.1.0"
edition = "2021"
# We need https://github.com/rust-lang/rust/pull/89825
rust-version = "1.59"

[dependencies]
clap = { version = "3.1.6", features = ["derive"] }
itertools = "0.10.3"
regex = "1.5.5"
similar = { version="2.1.0", features = ["bytes"] }

[dev-dependencies]
assert_cmd = "2.0.4"
insta = "1.13.0"
tempdir = "0.3.7"