dgit.raspbian.org Git - cargo.git/commit

Merge branch 'conflict_tracking' into links

# Conflicts:
# src/cargo/core/resolver/mod.rs
# tests/resolve.rs

Unnamed repository; edit this file 'description' to name the repository.

src/cargo/core/manifest.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/core/resolver/mod.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/core/summary.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/ops/registry.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/sources/registry/index.rs	diff1 \|	diff2 \|	blob \| history
src/cargo/util/toml/mod.rs	diff1 \|	diff2 \|	blob \| history
tests/resolve.rs	diff1 \|	diff2 \|	blob \| history