add support for .gitattributes

(cherry picked from commit 6376f6189950156cc1488c86f22b19dd4feec11c)

diff --git a/util/merge_copyrights b/util/merge_copyrights
index b66a7090b2305326a991f2a2427499144a666dc2..b216257bd9a6d915cc8305bcc43ce2064f0228bc 100644 (file)
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -104,7 +104,7 @@ while (<CHANGES>) {
            $file_types{$_} = "ZONE";
        } elsif ($base =~ /\.mkd$/) {
            $file_types{$_} = "MKD";
-       } elsif ($base =~ /(\/\.gitignore|Atffile|\.(gif|jpg))$/i) {
+       } elsif ($base =~ /(\/\.(gitignore|gitattributes)|Atffile|\.(gif|jpg))$/i) {
            $file_types{$_} = "X";
        } elsif ($base =~ /\.(def|dep|dsp|dsw|mak|sln)$/i) {
            $file_types{$_} = "X";