From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Nov 2017 04:43:55 +0000 (+0900)
Subject: Sync with v2.15.1
X-Git-Tag: v2.16.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff?hp=afc63cb6c6676a89a0549568163d4fe88093c94c

Sync with v2.15.1
---

diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
index a6ae4c1aeb..ec06704e63 100644
--- a/Documentation/RelNotes/2.15.1.txt
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -82,4 +82,7 @@ Fixes since v2.15
  * An ancient bug in "git apply --ignore-space-change" codepath has
    been fixed.
 
+ * There was a recent semantic mismerge in the codepath to write out a
+   section of a configuration section, which has been corrected.
+
 Also contains various documentation updates and code clean-ups.