fix 'make test' for HP NonStop

diff --git a/attr.c b/attr.c
index f12c83f80a0f03b2112c212e46c571ec4074abf3..3430faf2ccc5e11a9c04432b7a4f13160130e141 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,
 };