projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c5eecd ae796ad)
Merge remote-tracking branch 'upstream/master' into pr4988
authorXimin Luo <infinity0@pwned.gg>
Tue, 6 Mar 2018 18:56:35 +0000 (19:56 +0100)
committerXimin Luo <infinity0@pwned.gg>
Tue, 6 Mar 2018 18:56:35 +0000 (19:56 +0100)
1  2 
src/cargo/core/resolver/mod.rs patch | diff1 | diff2 | blob | history

diff --cc src/cargo/core/resolver/mod.rs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.