diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2017-12-07 23:59:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 23:59:03 +0100 |
| commit | 655303ce9b759a2b7484a569f9a5df035a7cfdc3 (patch) | |
| tree | d81f48c7c327e4b2cd0c035499c47b36a2f2d124 /src/libstd/sys/unix/stack_overflow.rs | |
| parent | 1b7ea6d2d404833d0c5af44f750c45e95896df7a (diff) | |
| parent | 77faf79c0e2b8cf52a4ce9d3aaece794674ac2ae (diff) | |
| download | rust-655303ce9b759a2b7484a569f9a5df035a7cfdc3.tar.gz rust-655303ce9b759a2b7484a569f9a5df035a7cfdc3.zip | |
Rollup merge of #46539 - oli-obk:cargo_lock, r=alexcrichton
Do not automatically merge `Cargo.lock` It essentially never does what it's supposed to and often leaves the `Cargo.lock` in a state where it needs manual adjustments or resetting to master/yourbranch. With this setting git will always choose your `Cargo.lock` over the one from master and report a merge error (if both master and your branch touched `Cargo.lock`). Now you can run `./x.py help` and it should normally update the `Cargo.lock` to be one that has everything needed by master and your branch.
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions