Set NO_MMAP for Cygwin by default

[git.git] / commit.h

diff --git a/commit.h b/commit.h
index fc13de9780f98c3bd9f330ef6177fd47a4da3d80..10eea9f26ff5db9df82245756c9c8bff0f6be3f6 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -107,4 +107,5 @@ int read_graft_file(const char *graft_file);
 
 extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup);
 
+int in_merge_bases(struct commit *rev1, struct commit *rev2);
 #endif /* COMMIT_H */