>     BranchBase .merge(branch, source, options, cb(err)) should emit an error by default if a merge conflict is found: [2K[0G  ․ BranchBase .merge(branch, source, options, cb(err)) should emit an error by default if a merge conflict is found
>     BranchBase .merge(branch, source, options, cb(err)) should accept a "weak" option, by which it would apply only non-conflicting changes: [2K[0G  ․ BranchBase .merge(branch, source, options, cb(err)) should accept a "weak" option, by which it would apply only non-conflicting changes
>     BranchBase .merge(branch, source, options, cb(err)) should accept a "strong" option, by which it will force the change in case of a conflict: [2K[0G  ․ BranchBase .merge(branch, source, options, cb(err)) should accept a "strong" option, by which it will force the change in case of a conflict
107c110
<   104 passing (187 ms)
---
>   107 passing (275 ms)