Commit ceb466a7cccf5ed6424cd7e24839389a42e998c1

Stefan Sperling 2020-04-18T11:21:53

add a test for 'got cherrypick' with existing merge conflicts