|
F
|
PhpMerge\GitMerge::getConflicts()
|
0
|
111
|
24
|
24
|
0
|
0
|
0
|
|
F
|
PhpMerge\PhpMerge::mergeHunks()
|
0
|
39
|
23
|
23
|
0
|
0
|
0
|
|
D
|
PhpMerge\PhpMerge::prepareConflict()
|
0
|
41
|
19
|
19
|
0
|
0
|
0
|
|
B
|
PhpMerge\internal\Hunk::createArray()
|
0
|
33
|
11
|
11
|
0
|
0
|
0
|
|
B
|
internal\Hunk::hasIntersection()
|
0
|
6
|
7
|
7
|
0
|
0
|
0
|
|
A
|
PhpMerge\internal\Line::createArray()
|
0
|
19
|
5
|
5
|
0
|
0
|
0
|
|
A
|
PhpMerge\GitMerge::mergeFile()
|
0
|
17
|
2
|
2
|
0
|
0
|
0
|
|
A
|
PhpMerge\PhpMerge::merge()
|
0
|
17
|
3
|
3
|
0
|
0
|
0
|
|
A
|
PhpMerge\GitMerge::merge()
|
0
|
15
|
3
|
3
|
0
|
0
|
0
|
|
A
|
PhpMerge\GitMerge::setup()
|
0
|
11
|
4
|
4
|
0
|
0
|
0
|
|
A
|
PhpMerge\GitMerge::cleanup()
|
0
|
11
|
4
|
4
|
0
|
0
|
0
|
|
A
|
PhpMerge\MergeConflict::__construct()
|
0
|
5
|
1
|
1
|
0
|
0
|
0
|
|
A
|
PhpMerge\internal\Hunk::getEnd()
|
0
|
1
|
1
|
1
|
0
|
0
|
0
|
|
A
|
PhpMerge\MergeConflict::getMergedLine()
|
0
|
1
|
1
|
1
|
0
|
0
|
0
|
|
A
|
PhpMerge\internal\Line::__construct()
|
0
|
3
|
1
|
1
|
0
|
0
|
0
|