Mercurial > hg
view contrib/merge-lists/Cargo.toml @ 51486:0ddc34330d41
branchcache: do not accept "empty update"
This currently does not happens and it will be simpler that is remains that way.
If all update do something, we will be able to simply declare, in a later
changesets, that all update to result in a dirty branchcache.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 08 Mar 2024 15:06:54 +0100 |
parents | 337bc83c1275 |
children |
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 = "4.3.17", 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"