thodg/libgit2

diff --git a/include/git2/merge.h b/include/git2/merge.h
index c80803d..37b1c78 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -28,7 +28,7 @@ GIT_BEGIN_DECL
  * @param one one of the commits
  * @param two the other commit
  */
-GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two);
+GIT_EXTERN(int) git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two);
 
 /**
  * Find a merge base given a list of commits
diff --git a/src/revwalk.c b/src/revwalk.c
index 1a09277..8141d17 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -419,7 +419,7 @@ cleanup:
 	return error;
 }
 
-int git_merge_base(git_oid *out, git_repository *repo, git_oid *one, git_oid *two)
+int git_merge_base(git_oid *out, git_repository *repo, const git_oid *one, const git_oid *two)
 {
 	git_revwalk *walk;
 	git_vector list;