Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
configure union merge for Changelog*.next.asciidoc (elastic#10003) (e…
…lastic#10024) * configure union merge for Changelog*.next.asciidoc This change automatically merges Changelog*.next.asciidoc files when merging or rebasing via `merge=union`. No more need to fix changelog files when doing `git rebase master`. * Remove union merge from Changelog.asciidoc (cherry picked from commit 64453fd)
- Loading branch information