diff options
Diffstat (limited to 'src/merge_driver.c')
| -rw-r--r-- | src/merge_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge_driver.c b/src/merge_driver.c index 17c386a14..be4d3bf8a 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -110,7 +110,7 @@ int git_merge_driver__builtin_apply( merged_out->ptr = (char *)result.ptr; merged_out->size = result.len; - merged_out->asize = result.len; + merged_out->reserved = 0; result.ptr = NULL; done: |