diff options
| author | Cyril Cohen | 2020-08-11 03:56:28 +0200 |
|---|---|---|
| committer | GitHub | 2020-08-11 03:56:28 +0200 |
| commit | d7c08d664a58f8ee99ae9a0de805c8af89889ba5 (patch) | |
| tree | 0e7bb157a27497e1db41d48cc94939c8fd8610d6 | |
| parent | 16a8f48a4ac0a871ece84049f6271a6926e850e3 (diff) | |
| parent | dc20e2d9c85fd90393867f816f659edee1ac8a92 (diff) | |
Merge pull request #551 from CohenCyril/merge-changelog-by-union
Use union driver for CHANGELOG_UNRELEASED
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 51c6be8..3c05377 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ .git* export-ignore .mailmap export-ignore +CHANGELOG_UNRELEASED.md merge=union
\ No newline at end of file |