Merge branch 'maint'

diff --git a/attr.c b/attr.c
index f12c83f80a0f03b2112c212e46c571ec4074abf3..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,
 };
 
@@ -353,7 +353,7 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
        int lineno = 0;
 
        if (!fp) {
-               if (errno != ENOENT)
+               if (errno != ENOENT && errno != ENOTDIR)
                        warn_on_inaccessible(path);
                return NULL;
        }