diff --git a/.gitattributes b/.gitattributes index 3426f1dee..4cc803e80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ lib/emscripten/emtests/* linguist-vendored lib/spectests/spectests/* linguist-vendored +CHANGELOG.md merge=union