diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-06-21 09:12:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-21 09:12:34 +0200 |
| commit | 73cc4eca564e77121c487e5034f21f0b92c4e467 (patch) | |
| tree | bde6c9612941f5217b205f5456e810d4f6518999 /compiler/rustc_codegen_llvm/src | |
| parent | 4e6de37349c7838df095b085a2640cb6a007c96a (diff) | |
| parent | 9f6371236f516ac2a883eb8707839ab80fc7f9f7 (diff) | |
| download | rust-73cc4eca564e77121c487e5034f21f0b92c4e467.tar.gz rust-73cc4eca564e77121c487e5034f21f0b92c4e467.zip | |
Rollup merge of #126125 - dev-ardi:conflict-markers, r=estebank
Improve conflict marker recovery
<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.
This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using
r? <reviewer name>
-->
closes #113826
r? ```@estebank``` since you reviewed #115413
cc: ```@rben01``` since you opened up the issue in the first place
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions