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