annotate rust/Cargo.toml @ 42804:7b80ad5af239

merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Aug 2019 13:14:39 -0700
parents 5532823e8c18
children 79ac59d3f73d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
35569
964212780daf rust: implementation of `hg`
Gregory Szorc <gregory.szorc@gmail.com>
parents:
diff changeset
1 [workspace]
40965
5532823e8c18 rust-cpython: start cpython crate bindings
Georges Racinet <gracinet@anybox.fr>
parents: 40964
diff changeset
2 members = ["hg-core", "hg-direct-ffi", "hg-cpython"]
40964
98a0fbda8739 rust-cpython: exclude hgcli from workspace
Georges Racinet <gracinet@anybox.fr>
parents: 40272
diff changeset
3 exclude = ["chg", "hgcli"]