Merge branch 'dl/apply-3way-diff3'

[thirdparty/git.git] / patch-ids.h

diff --git a/patch-ids.h b/patch-ids.h
index 82a12b66f8891e5a9a45c2a63845dd28de7eeda7..03bb04e7071f5f65a3b09f138aa4473fa0a0a655 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -20,7 +20,7 @@ struct patch_ids {
 };
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
-                   struct object_id *oid, int);
+                   struct object_id *oid, int, int);
 int init_patch_ids(struct repository *, struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);