X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=inline;f=t%2F00-merge-conflict-markers.t;h=2e3b2fd579aa627f701aab61a5335f5cec7ef56f;hb=822f898f66ddc0f77894c3a3494f6e104e3aa745;hp=da11a58502d6347bb0eedae1fa9a2a768dcb4c3e;hpb=5c2def51587c4b2636b5f066306b8bd5dc0e7a7a;p=koha.git

diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t
index da11a58502..2e3b2fd579 100644
--- a/t/00-merge-conflict-markers.t
+++ b/t/00-merge-conflict-markers.t
@@ -29,7 +29,7 @@ find({
     wanted => sub {
         my $file = $_;
 
-        return if $file =~ /\.(ico|jpg|gif|ogg|pdf|png|psd|swf|zip)$/;
+        return if $file =~ /\.(ico|jpg|gif|ogg|pdf|png|psd|swf|zip|.*\~)$/;
         return unless -f $file;
 
         my @name_parts = File::Spec->splitpath($file);