diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 4313aef9..00000000 --- a/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -# Additive edits to the [[example]] list collide constantly across topic -# branches. The built-in union merge driver keeps both sides of a conflict -# hunk, auto-resolving append-only lists. (Distinct dependency-line edits are -# caught by CI, not silently merged wrong.) -Cargo.toml merge=union