diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..dc8bb388963480c2d3b73ca2020bba2f98e5da6e --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +doc/changelog.rst merge=union