diff --git a/.gitattributes b/.gitattributes index 991065e069..7fbcb4fe2d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,5 @@ trio/_core/_generated* linguist-generated=true # Treat generated files as binary in git diff trio/_core/_generated* -diff +# don't merge the generated json file, let the user (script) handle it +trio/_tests/verify_types.json merge=binary