From 251d8421d5837fad11cf14b70987b82e81198e23 Mon Sep 17 00:00:00 2001
From: Richard Clamp <richardc@unixbeard.net>
Date: Mon, 26 Mar 2018 11:24:12 +0100
Subject: [PATCH] Update merge strategy for CHANGELOG.md

https://git-scm.com/docs/gitattributes#_performing_a_three_way_merge

In fee58e6556bd6d7e700347f92a42693af87a687e the file was renamed from
CHANGELOG -> CHANGELOG.md and later converted to markdown.

Here we update the .gitattributes to reflect the rename, as merge=union
will probably reduce some of the rebase conflicts in CHANGELOG.md
---
 .gitattributes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index 6bc5d6d47..30686c9c9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
-CHANGELOG merge=union
+CHANGELOG.md merge=union
 *.rb.template gitlab-language=ruby