blib/lib/App/Git/Workflow/Command/BranchConflicts.pm | |||
---|---|---|---|
Criterion | Covered | Total | % |
branch | 12 | 18 | 66.6 |
line | true | false | branch |
---|---|---|---|
36 | 0 | 2 | $option{'both'} ? : |
1 | 2 | $option{'remote'} ? : | |
40 | 0 | 3 | $option{'merge'} ? : |
46 | 0 | 6 | if $option{'since'} and not $workflow->git->log(('-n1', '--since'), $option{'since'}, $first_branch) |
48 | 0 | 6 | if $option{'verbose'} |
53 | 0 | 12 | if $option{'since'} and not $workflow->git->log(('-n1', '--since'), $option{'since'}, $branch) |
54 | 2 | 10 | if ($self->merge_branch_conflicts($branch)) |
67 | 1 | 2 | if (%conflicts) { } |
105 | 0 | 12 | if ($option{'ignore'}) |