projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a7cae5 3f4d7e7)
Auto merge of #4467 - RalfJung:locked, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 5 Sep 2017 16:04:29 +0000 (16:04 +0000)
committerbors <bors@rust-lang.org>
Tue, 5 Sep 2017 16:04:29 +0000 (16:04 +0000)
fix error message when --locked is passed but lockfile is outdated

The logic is currently the wrong way around, saying I passed `--frozen` when I really passed `--locked`.

I had no idea where to put the test...


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