Improve test_merge_conflict via new prompt_yes_or_no
#451
background
wait
wait-all
cancel
parallel
Loading