Sync with 'maint'

diff --git a/Documentation/RelNotes/1.8.3.4.txt b/Documentation/RelNotes/1.8.3.4.txt
index 24ee2b8017a74aae6e895f230ad0ebcc70c0974d..56f106e2623b8149bcb2d032c3ddd9b58aaaaa3c 100644 (file)
--- a/Documentation/RelNotes/1.8.3.4.txt
+++ b/Documentation/RelNotes/1.8.3.4.txt
@@ -13,3 +13,8 @@ Fixes since v1.8.3.3
  * The test coverage framework was left broken for some time.
 
  * The test suite for HTTP transport did not run with Apache 2.4.
+
+ * "git diff" used to fail when core.safecrlf is set and the working
+   tree contents had mixed CRLF/LF line endings. Committing such a
+   content must be prohibited, but "git diff" should help the user to
+   locate and fix such problems without failing.