Merge branch 'jc/ll-merge-binary-ours'

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e16f3e175bd8915d139961c649be209b0afc535f..462b79c120ddb132bd125104240a488cc31f877b 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -927,7 +927,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
 ------------