From d932f4eb9fc88e93040635d291f6c195ea2e4ee3 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 4 Aug 2011 06:36:33 +0200 Subject: Rename git_checkattr() to git_check_attr() Suggested by: Junio Hamano Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- ll-merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'll-merge.c') diff --git a/ll-merge.c b/ll-merge.c index 6ce512efc..da59738c9 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -330,7 +330,7 @@ static int git_path_check_merge(const char *path, struct git_attr_check check[2] check[0].attr = git_attr("merge"); check[1].attr = git_attr("conflict-marker-size"); } - return git_checkattr(path, 2, check); + return git_check_attr(path, 2, check); } static void normalize_file(mmfile_t *mm, const char *path) @@ -387,7 +387,7 @@ int ll_merge_marker_size(const char *path) if (!check.attr) check.attr = git_attr("conflict-marker-size"); - if (!git_checkattr(path, 1, &check) && check.value) { + if (!git_check_attr(path, 1, &check) && check.value) { marker_size = atoi(check.value); if (marker_size <= 0) marker_size = DEFAULT_CONFLICT_MARKER_SIZE; -- cgit v1.2.1