Merge branch 'mm/rebase-i-exec-edit' into maint

diff --git a/userdiff.c b/userdiff.c
index 01d3a8b81e628b0a088e3e9fc0ca59acf7d9c58d..bf553ad91b55de8a762d56a6ffc6c86e959e878c 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -270,7 +270,7 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)
 
        if (!path)
                return NULL;
-       if (git_checkattr(path, 1, &check))
+       if (git_check_attr(path, 1, &check))
                return NULL;
 
        if (ATTR_TRUE(check.value))