From dc20e2d9c85fd90393867f816f659edee1ac8a92 Mon Sep 17 00:00:00 2001
From: Cyril Cohen <cohen@crans.org>
Date: Tue, 11 Aug 2020 03:11:49 +0200
Subject: [PATCH] Use union driver for CHANGELOG_UNRELEASED

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 51c6be862c..3c053776d7 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