Merge branch 'js/refer-upstream'

diff --git a/userdiff.c b/userdiff.c
index 57529ae63d49826952b29860b3d4106b60250c7b..df992490d5f86b5eff2b87e90090b1ec576aae9a 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -198,7 +198,7 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)
        struct git_attr_check check;
 
        if (!attr)
-               attr = git_attr("diff", 4);
+               attr = git_attr("diff");
        check.attr = attr;
 
        if (!path)