git_attr(): fix function signature

diff --git a/ll-merge.c b/ll-merge.c
index 2d6b6d6cb1d2bc2d334bf058feb3444e94b5a781..f4b0a0737723d879b1ddfea9376f1644bff029c7 100644 (file)
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -344,7 +344,7 @@ static const char *git_path_check_merge(const char *path)
        static struct git_attr_check attr_merge_check;
 
        if (!attr_merge_check.attr)
-               attr_merge_check.attr = git_attr("merge", 5);
+               attr_merge_check.attr = git_attr("merge");
 
        if (git_checkattr(path, 1, &attr_merge_check))
                return NULL;