Improve test_merge_conflict via new prompt_yes_or_no
#453
test.yml
on: pull_request
Test coverage
3m 11s
Matrix: Build and test