diff options
Diffstat (limited to 'include/git2/sys/merge.h')
| -rw-r--r-- | include/git2/sys/merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/git2/sys/merge.h b/include/git2/sys/merge.h index ef4bc5aca..ee5fb5c73 100644 --- a/include/git2/sys/merge.h +++ b/include/git2/sys/merge.h @@ -109,7 +109,7 @@ typedef int GIT_CALLBACK(git_merge_driver_apply_fn)( git_merge_driver *self, const char **path_out, uint32_t *mode_out, - git_buf *merged_out, + git_userbuf *merged_out, const char *filter_name, const git_merge_driver_source *src); |