diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-28 13:43:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-28 13:44:21 +0900 |
| commit | 1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff (patch) | |
| tree | 49b04636554e1e849e06cc9fb6f4d75b25270b77 | |
| parent | afc63cb6c6676a89a0549568163d4fe88093c94c (diff) | |
| parent | 9b185bef0c15cec1ea8753ce091e42ea041f2c31 (diff) | |
| download | git-1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff.tar.gz | |
Sync with v2.15.1
| -rw-r--r-- | Documentation/RelNotes/2.15.1.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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. |