(mergerepo: Repository, favor: MergeFavor)
| 172 | ], |
| 173 | ) |
| 174 | def test_merge_favor(mergerepo: Repository, favor: MergeFavor) -> None: |
| 175 | branch_head = pygit2.Oid(hex='1b2bae55ac95a4be3f8983b86cd579226d0eb247') |
| 176 | mergerepo.merge(branch_head, favor=favor) |
| 177 | |
| 178 | assert mergerepo.index.conflicts is None |
| 179 | |
| 180 | |
| 181 | def test_merge_fail_on_conflict(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…