From 03f6e33c4b331cf0daeab4fe8f402173146b1f67 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 7 Dec 2011 15:17:54 +0100 Subject: [PATCH] Test suite: ignoring backups from vi (files ending with a ~) On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed! ignoring any file ending with a ~ (cherry picked from commit 13f29dd7f36137a77695af6c6eb3032ec72d9ae2) Signed-off-by: Chris Nighswonger --- t/00-merge-conflict-markers.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.39.5