master
add integration tests for cherry picking
Add tests demonstrating that we ignore the conflict-marker-size gitattribute