| line |
true |
false |
branch |
|
177
|
0 |
11 |
if (!ancestor) { |
|
178
|
0 |
0 |
if (ours && theirs && strcmp(ours, theirs) == 0) |
|
|
0 |
0 |
if (ours && theirs && strcmp(ours, theirs) == 0) |
|
|
0 |
0 |
if (ours && theirs && strcmp(ours, theirs) == 0) |
|
184
|
11 |
0 |
if (ours && strcmp(ancestor, ours) == 0) |
|
|
11 |
0 |
if (ours && strcmp(ancestor, ours) == 0) |
|
186
|
0 |
0 |
else if(theirs && strcmp(ancestor, theirs) == 0) |
|
|
0 |
0 |
else if(theirs && strcmp(ancestor, theirs) == 0) |
|
200
|
0 |
11 |
if (!ancestor) { |
|
201
|
0 |
0 |
if (ours == GIT_FILEMODE_BLOB_EXECUTABLE || |
|
|
0 |
0 |
if (ours == GIT_FILEMODE_BLOB_EXECUTABLE || |
|
206
|
11 |
0 |
} else if (ours && theirs) { |
|
|
11 |
0 |
} else if (ours && theirs) { |
|
207
|
11 |
0 |
if (ancestor == ours) |