projects
/
srvgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/new/bug_5337'
[srvgit]
/
t
/
00-merge-conflict-markers.t
diff --git
a/t/00-merge-conflict-markers.t
b/t/00-merge-conflict-markers.t
index
da11a58
..
2e3b2fd
100644
(file)
--- 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);