X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=t%2F00-merge-conflict-markers.t;h=2e3b2fd579aa627f701aab61a5335f5cec7ef56f;hb=ecf6721060607b621c58f234ab5a5f43e30b1d98;hp=24743aee11b67f407ff6a5dfa082481199d656c2;hpb=5278aa0ca4bb5110741b792b527725280a3ee902;p=koha.git

diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t
index 24743aee11..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);
@@ -49,8 +49,7 @@ find({
         }
         close $fh;
         if ($marker_found) {
-            fail("$file has no merge conflict markers");
-            diag("marker found in line $line");
+            fail("$file contains merge conflict markers in line $line");
         } else {
             pass("$file has no merge conflict markers");
         }