Merge branch 'ep/malloc-check-perturb'

[git.git] / attr.c

diff --git a/attr.c b/attr.c
index 056d702f6e244e4188abc3c8dc4db647699ec4d1..887a9ae46b7044489845abf2072339271caf2d4a 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,
 };