Merge branch 'rr/git-uri-doc' into maint

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index aff760ef7beefe81563f703c608dead93ce0704f..52ab93d2c286d1f91fde8f14eaf6c3742443dcf2 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -932,7 +932,7 @@ file at the toplevel (i.e. not in any subdirectory).  The built-in
 macro attribute "binary" is equivalent to:
 
 ------------
-[attr]binary -diff -text
+[attr]binary -diff -merge -text
 ------------