hooks: allow customizing where the hook directory is

diff --git a/merge-recursive.h b/merge-recursive.h
index f0e056652f47e3e31d2d084f98b6a6b9751ad22c..52f0201f68a30114345cbfcc8b3d6204174facfd 100644 (file)
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -17,14 +17,17 @@ struct merge_options {
        unsigned renormalize : 1;
        long xdl_opts;
        int verbosity;
+       int detect_rename;
        int diff_rename_limit;
        int merge_rename_limit;
        int rename_score;
        int needed_rename_limit;
+       int show_rename_progress;
        int call_depth;
        struct strbuf obuf;
        struct string_list current_file_set;
        struct string_list current_directory_set;
+       struct string_list df_conflict_file_set;
 };
 
 /* merge_trees() but with recursive ancestor consolidation */
@@ -57,7 +60,4 @@ struct tree *write_tree_from_memory(struct merge_options *o);
 
 int parse_merge_opt(struct merge_options *out, const char *s);
 
-/* builtin/merge.c */
-int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
-
 #endif