From 6437a2e18e9464162395bc0dd5b5f4754efc7d93 Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Tue, 28 Nov 2017 23:16:18 +0200
Subject: release-notes: use CHANGELOG.md

Add a file CHANGELOG.md in the root Subsurface directory
and track this file with the `-text merge=union` attribute.

This prevents merge conflicts if release notes are added
on top of the file by different commits.

Also, make ReleaseNotes/ReleaseNotes.txt point to that file.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github/PULL_REQUEST_TEMPLATE.md')

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7ba3fe91f..c8555c152 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -27,8 +27,8 @@
 <!-- Include sample dive log or other relevant information to allow testing the change where feasible. -->
 
 ### Release note:
-<!-- Describe if this change needs a release note present in ReleaseNotes/ReleaseNotes.txt. -->
-<!-- Also, please make sure to update the ReleaseNotes/ReleaseNotes.txt file itself. -->
+<!-- Describe if this change needs a release note present in CHANGELOG.md. -->
+<!-- Also, please make sure to add the release note on top of the file CHANGELOG.md. -->
 
 ### Documentation change:
 <!-- If this PR makes changes to user functionality, then the documentation has to be updated too. -->
-- 
cgit v1.2.3-70-g09d2