builtin/merge.c - cleanup of code in for-cycle that tests strategies

diff --git a/diff.h b/diff.h
index b20cbcc0914250de4921310d16d58ada4acb7984..b680b377b2f5871ecb3a27856f8d15fe2b1c8621 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -169,7 +169,7 @@ struct diff_options {
        const char *prefix;
        int prefix_length;
        const char *stat_sep;
-       long xdl_opts;
+       int xdl_opts;
 
        /* see Documentation/diff-options.txt */
        char **anchors;
@@ -436,7 +436,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option);
 int run_diff_index(struct rev_info *revs, int cached);
 
 int do_diff_cache(const struct object_id *, struct diff_options *);
-int diff_flush_patch_id(struct diff_options *, struct object_id *, int);
+int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
+void flush_one_hunk(struct object_id *, git_SHA_CTX *);
 
 int diff_result_code(struct diff_options *, int);