about summary refs log tree commit diff
path: root/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-20 14:02:49 +0000
committerbors <bors@rust-lang.org>2022-07-20 14:02:49 +0000
commitbd4439fafafb778f9d287f7369218c744381e8cd (patch)
treed1ead3947500a83e5efa7bae4c0c1ae0e849ef44 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
parent100ea1d2d55e70970d49f8d084ccbe1ac2621020 (diff)
parent244f29b1e7747c97922918c1d03df7ec96c2b965 (diff)
downloadrust-bd4439fafafb778f9d287f7369218c744381e8cd.tar.gz
rust-bd4439fafafb778f9d287f7369218c744381e8cd.zip
Auto merge of #12829 - fasterthanlime:in-rust-tree-feature, r=Veykril
Remove `check_merge_commits` test

Due to the way "git subtree" works, the `check_merge_commits` test _will_ find merge commits and fail, so we simply skip it.

This changed is tracked in:

  * https://github.com/rust-lang/rust-analyzer/issues/12818

Maintainer impact: none
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions