diff --git a/.gitattributes b/.gitattributes index 537c1036df..e5e85490a5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -*.expected.out binary +*.expected.out -text doc/changes.md merge=union