diff options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index 939f20214..769df5a8d 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; |