test_conflicts and test_resolve_command: use indoc!
to indent conflict markers in tests
#6085
dependabot.yml
on: pull_request
Dependabot auto-merge
0s