jacquesg/p5-Git-Raw

t/15-merge.t fails with merge.conflictstyle = diff3

haarg opened this issue · 1 comments

haarg commented

I have merge.conflictstyle set to diff3 globally, and this causes t/15-merge.t to fail.

jacquesg commented

Thanks for the bug report, I've set it to just merge for the test repo.