Mercurial > hg
view contrib/merge-lists/Cargo.toml @ 49718:e64b1e9f4892
path: pass `path` to `peer` in `hg incoming`
We directly use the `path` object to build the `peer` object.
We don't use it for sub-repositories yet, which will have to be fixed at some
point.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 01 Dec 2022 18:19:08 +0100 |
parents | 681b25ea579e |
children | 337bc83c1275 |
line wrap: on
line source
# 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"