diff options
Diffstat (limited to 'src/merge_driver.c')
| -rw-r--r-- | src/merge_driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c index 666349b15..021f6227d 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -66,7 +66,7 @@ int git_merge_driver__builtin_apply( 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) { @@ -117,7 +117,7 @@ static int merge_driver_binary_apply( 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) { |