Auto merge of #134199 - RalfJung:gitmerge, r=oli-obk

Browse Source

Revert "Stop git from merging generated files"

This reverts https://github.com/rust-lang/rust/pull/133851. "-merge" makes git not even do merges if they are entirely conflict-free, which is not the behavior we want. We sometimes have conflict-free merges in generated files and it's much better if git can handle them automatically.

r? `@oli-obk`
Cc `@jieyouxu` `@Urgau`

...

This commit is contained in:

bors 2024-12-12 12:02:38 +00:00

parent 67dcb7a3c3 4c05bc75bb

commit e4c861005c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available