View | Details | Raw Unified | Return to bug 19335
Collapse All | Expand All

(-)a/t/00-merge-conflict-markers.t (-9 / +5 lines)
Lines 38-51 find({ Link Here
38
38
39
        my $fh = IO::File->new($file, 'r');
39
        my $fh = IO::File->new($file, 'r');
40
        my $marker_found = 0;
40
        my $marker_found = 0;
41
        my $line = 0;
41
        while (my $line = <$fh>) {
42
        while (<$fh>) {
42
            # could check for ^=====, but that's often used in text files
43
            $line++;
43
            $marker_found++ if $line =~ m|^<<<<<<|;
44
            if (/^<<<<<</ or /^>>>>>>/) {
44
            $marker_found++ if $line =~ m|^>>>>>>|;
45
                # could check for ^=====, but that's often used in text files
45
            last if $marker_found;
46
                $marker_found = 1;
47
                last;
48
            }
49
        }
46
        }
50
        close $fh;
47
        close $fh;
51
        push @failures, $file if $marker_found;
48
        push @failures, $file if $marker_found;
52
- 

Return to bug 19335