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

(-)a/t/00-merge-conflict-markers.t (-3 / +1 lines)
Lines 49-56 find({ Link Here
49
        }
49
        }
50
        close $fh;
50
        close $fh;
51
        if ($marker_found) {
51
        if ($marker_found) {
52
            fail("$file has no merge conflict markers");
52
            fail("$file contains merge conflict markers in line $line");
53
            diag("marker found in line $line");
54
        } else {
53
        } else {
55
            pass("$file has no merge conflict markers");
54
            pass("$file has no merge conflict markers");
56
        }
55
        }
57
- 

Return to bug 7095