diff options
Diffstat (limited to 'src/merge_file.c')
| -rw-r--r-- | src/merge_file.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge_file.c b/src/merge_file.c index ab9ca4168..ff0364432 100644 --- a/src/merge_file.c +++ b/src/merge_file.c @@ -117,7 +117,7 @@ static int git_merge_file__from_inputs( memset(out, 0x0, sizeof(git_merge_file_result)); - merge_file_normalize_opts(&options, given_opts); + merge_file_normalize_opts(&options, given_opts); memset(&xmparam, 0x0, sizeof(xmparam_t)); @@ -165,7 +165,7 @@ static int git_merge_file__from_inputs( } out->automergeable = (xdl_result == 0); - out->ptr = (unsigned char *)mmbuffer.ptr; + out->ptr = (const char *)mmbuffer.ptr; out->len = mmbuffer.size; out->mode = merge_file_best_mode(ancestor, ours, theirs); |