From b6aafda139608596720304dcedb26768105e749d Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Mon, 21 Jan 2019 17:25:24 +1100
Subject: [PATCH] CHANGELOG: 3.0.1 verbiage

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c1e9f45a..0782b2051 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 # fish 3.0.1
 
+This release of fish fixes a number of major issues discovered in fish 3.0.0.
+
 ### Fixes and improvements
 
 - exec now behaves properly inside functions (#5449)
@@ -7,6 +10,9 @@
 - `read --silent` no longer echoes to the tty when run from a non-interactive script (#5519)
 - (macOS only) /etc/paths and /etc/paths.d now correctly set path entries with spaces. Also affects MANPATH. (#5481)
 
+If you are upgrading from version 2.7.1 or before, please also review the release notes for 3.0.0 and 3.0b1 (included below).
+
+---
 
 # fish 3.0.0 (released December 28, 2018)