Enable merge union strategy for changelog.md (#6590)
Enable merge union strategy for changelog.md (#6590)

This provides a reasonable automatic merge strategy for changelog entries
gsantovena/marathon,mesosphere/marathon,mesosphere/marathon,mesosphere/marathon,gsantovena/marathon,gsantovena/marathon,gsantovena/marathon,gsantovena/marathon,mesosphere/marathon,mesosphere/marathon