Karsten JeschkiesandGitHub
67a5c19b17
Summary: This provides a reasonable automatic merge strategy for changelog entries. No more merge conflicts on changelog changes.
2 lines
25 B
Plaintext
2 lines
25 B
Plaintext
CHANGELOG.md merge=union
|