attr: "binary" attribute should choose built-in "binary" merge driver

diff --git a/attr.c b/attr.c
index 303751f6c2bd4d558cffbb928c636581efb2b310..3f581b3cec688aab9e93f6c83f579eef6f378488 100644 (file)
--- a/attr.c
+++ b/attr.c
@@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e)
 }
 
 static const char *builtin_attr[] = {
-       "[attr]binary -diff -text",
+       "[attr]binary -diff -merge -text",
        NULL,
 };