diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-12-04 18:23:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 18:23:44 +0100 |
| commit | d80d2c64b7dd5a3d38ad182d0426edd01f43021c (patch) | |
| tree | d72eb34b1c17d7c46c844eb41668409995caee33 /tests/coverage/branch/lazy-boolean.coverage | |
| parent | ea4e7192ac02b3dea9cf3c680bd0a252076c1133 (diff) | |
| parent | 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e (diff) | |
| download | rust-d80d2c64b7dd5a3d38ad182d0426edd01f43021c.tar.gz rust-d80d2c64b7dd5a3d38ad182d0426edd01f43021c.zip | |
Rollup merge of #133851 - oli-obk:push-pzwykzozkomq, r=jieyouxu
Stop git from merging generated files See the relevant documentation for details: https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-Unset-1-1-1 This will cause `.stderr`, `.stdout`, `.mir`, and `.fixed` files to stop generating conflict markers and instead just pick the version from your branch, not the one you're rebasing over. Git will still raise a conflict and thus stop a rebase at that commit, but it avoids having to deal with conflict markers in files where we just bless them away anyway.
Diffstat (limited to 'tests/coverage/branch/lazy-boolean.coverage')
0 files changed, 0 insertions, 0 deletions