diff options
| author | Cyril Cohen | 2020-08-11 03:11:49 +0200 |
|---|---|---|
| committer | Cyril Cohen | 2020-08-11 03:55:04 +0200 |
| commit | dc20e2d9c85fd90393867f816f659edee1ac8a92 (patch) | |
| tree | 2e419e78f21bea2600fcaec2017a710bc0b4cde7 /.gitattributes | |
| parent | 0265476610747475a856f0560a86fe3b5409469f (diff) | |
Use union driver for CHANGELOG_UNRELEASED
Diffstat (limited to '.gitattributes')
| -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 |