diff options
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ll-merge.c b/ll-merge.c index 130d26501c..07ec16e8e5 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -4,13 +4,16 @@ * Copyright (c) 2007 Junio C Hamano */ -#include "cache.h" +#include "git-compat-util.h" #include "config.h" +#include "convert.h" #include "attr.h" #include "xdiff-interface.h" #include "run-command.h" #include "ll-merge.h" #include "quote.h" +#include "strbuf.h" +#include "wrapper.h" struct ll_merge_driver; @@ -391,7 +394,7 @@ enum ll_merge_result ll_merge(mmbuffer_t *result_buf, normalize_file(theirs, path, istate); } - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); ll_driver_name = check->items[0].value; if (check->items[1].value) { marker_size = atoi(check->items[1].value); @@ -419,7 +422,7 @@ int ll_merge_marker_size(struct index_state *istate, const char *path) if (!check) check = attr_check_initl("conflict-marker-size", NULL); - git_check_attr(istate, NULL, path, check); + git_check_attr(istate, path, check); if (check->items[0].value) { marker_size = atoi(check->items[0].value); if (marker_size <= 0) |