From b346f0d0d37f2fb76b2d2368136a53bcd1425ea4 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 8 Mar 2012 13:43:46 -0800
Subject: [PATCH] s/cvsignore/gitignore/

---
 util/merge_copyrights | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/merge_copyrights b/util/merge_copyrights
index e2a0c802ba..56cca21150 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -82,7 +82,7 @@ while (<FILES>) {
 	    $file_types{$_} = "CONF-SH";
 	} elsif ($base =~ /\.(db|hint)$/) {
 	    $file_types{$_} = "ZONE";
-	} elsif ($base =~ /(\/\.cvsignore|\.gif|\.jpg|\.dsp|\.dsw|\.mak)$/i) {
+	} elsif ($base =~ /(\/\.gitignore|\.gif|\.jpg|\.dsp|\.dsw|\.mak)$/i) {
 	    $file_types{$_} = "X";
 	} elsif ($base =~ /\.rnc$/i) {
 	    $file_types{$_} = "RNC";