New upstream version 1.4.3+dfsg.1

[libgit2.git] / src / merge_driver.c

diff --git a/src/merge_driver.c b/src/merge_driver.c
index 17c386a143c738ee18df5bd41ec62bb434dfa7e1..19b35ac0ea6a85a10caa1a2a4ebac36804565318 100644 (file)
--- a/src/merge_driver.c
+++ b/src/merge_driver.c
@@ -93,7 +93,7 @@ int git_merge_driver__builtin_apply(
                goto done;
 
        if (!result.automergeable &&
-               !(file_opts.flags & GIT_MERGE_FILE_FAVOR__CONFLICTED)) {
+               !(file_opts.flags & GIT_MERGE_FILE_ACCEPT_CONFLICTS)) {
                error = GIT_EMERGECONFLICT;
                goto done;
        }
@@ -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: