From 5cce1278adb168cd9fa4f189e3656a59726b4e6c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Wed, 27 Jan 2016 17:23:59 +0100
Subject: Correctly determine MR diff base when MR has merge conflicts

---
 CHANGELOG | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 4b283f235a4..e7273e017ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,8 +20,7 @@ v 8.4.2 (unreleased)
     improvement when checking if a repository was empty
   - Add instrumentation for Gitlab::Git::Repository instance methods so we can
     track them in Performance Monitoring.
-
-v 8.4.2 (unreleased)
+  - Correctly highlight MR diff when MR has merge conflicts
   - Fix method undefined when using external commit status in builds
 
 v 8.4.1
-- 
cgit v1.2.1