diff --git a/.gitattributes b/.gitattributes index 7f24a8f81d..8ddae6fce4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,4 @@ template linguist-language=bash common/shlibs merge=union +*.patch whitespace=-space-before-tab,-trailing-space +*.diff whitespace=-space-before-tab,-trailing-space