# Changelog entries from different branches are appended at the same place,
# so keep both sides instead of conflicting on every rebase.
#
# Note: GitHub does not honour this server-side when computing pull request
# mergeability, so PRs can still show a CHANGELOG conflict that resolves
# cleanly on a local rebase.
CHANGELOG.md merge=union
