@@ -, +, @@ ------------------- Non-zero wait status: 9 Parse errors: Bad plan. You planned 1 tests but ran 0. misc/translator/po/kn-Knda-pref.po misc/translator/po/ja-Jpan-JP-pref.po misc/translator/po/nl-BE-pref.po misc/translator/po/sr-Cyrl-pref.po --- t/00-merge-conflict-markers.t | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) --- a/t/00-merge-conflict-markers.t +++ a/t/00-merge-conflict-markers.t @@ -38,14 +38,11 @@ find({ my $fh = IO::File->new($file, 'r'); my $marker_found = 0; - my $line = 0; - while (<$fh>) { - $line++; - if (/^<<<<<>>>>>/) { - # could check for ^=====, but that's often used in text files - $marker_found = 1; - last; - } + while (my $line = <$fh>) { + # could check for ^=====, but that's often used in text files + $marker_found++ if $line =~ m|^<<<<<<|; + $marker_found++ if $line =~ m|^>>>>>>|; + last if $marker_found; } close $fh; push @failures, $file if $marker_found; --