X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=779ed82ed0ce2fb1a643b1cfa0ffe0fd3107ed09;hb=68d42c41ef33cde500307660bb64a1c74f62711e;hp=3a26e29ce6142ccafa5365a91cebf6b6a7234297;hpb=31609c17251f368584f7b94d44b06194112b4251;p=git.git

diff --git a/commit.h b/commit.h
index 3a26e29ce..779ed82ed 100644
--- a/commit.h
+++ b/commit.h
@@ -105,7 +105,6 @@ struct commit_graft *read_graft_line(char *buf, int len);
 int register_commit_graft(struct commit_graft *, int);
 int read_graft_file(const char *graft_file);
 
-extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
-extern struct commit_list *get_merge_bases_clean(struct commit *rev1, struct commit *rev2);
+extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 
 #endif /* COMMIT_H */