thodg/libgit2

diff --git a/include/git2/merge.h b/include/git2/merge.h
index 939f202..769df5a 100644
--- a/include/git2/merge.h
+++ b/include/git2/merge.h
@@ -177,13 +177,13 @@ typedef struct {
 	 * The path that the resultant merge file should use, or NULL if a
 	 * filename conflict would occur.
 	 */
-	char *path;
+	const char *path;
 
 	/** The mode that the resultant merge file should use.  */
 	unsigned int mode;
 
 	/** The contents of the merge. */
-	unsigned char *ptr;
+	const char *ptr;
 
 	/** The length of the merge contents. */
 	size_t len;
diff --git a/src/merge_file.c b/src/merge_file.c
index fc45cbf..ab9ca41 100644
--- a/src/merge_file.c
+++ b/src/merge_file.c
@@ -272,8 +272,8 @@ void git_merge_file_result_free(git_merge_file_result *result)
 	if (result == NULL)
 		return;
 
-	git__free(result->path);
+	git__free((char *)result->path);
 
 	/* xdiff uses malloc() not git_malloc, so we use free(), not git_free() */
-	free(result->ptr);
+	free((char *)result->ptr);
 }