diff options
Diffstat (limited to 'tests/merge/trees')
| -rw-r--r-- | tests/merge/trees/automerge.c | 4 | ||||
| -rw-r--r-- | tests/merge/trees/trivial.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c index 746ce5068..ebc6e271d 100644 --- a/tests/merge/trees/automerge.c +++ b/tests/merge/trees/automerge.c @@ -149,7 +149,7 @@ void test_merge_trees_automerge__favor_ours(void) REMOVED_IN_MASTER_REUC_ENTRY, }; - opts.automerge_flags = GIT_MERGE_AUTOMERGE_FAVOR_OURS; + opts.file_favor = GIT_MERGE_FILE_FAVOR_OURS; cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts)); @@ -180,7 +180,7 @@ void test_merge_trees_automerge__favor_theirs(void) REMOVED_IN_MASTER_REUC_ENTRY, }; - opts.automerge_flags = GIT_MERGE_AUTOMERGE_FAVOR_THEIRS; + opts.file_favor = GIT_MERGE_FILE_FAVOR_THEIRS; cl_git_pass(merge_trees_from_branches(&index, repo, "master", THEIRS_AUTOMERGE_BRANCH, &opts)); diff --git a/tests/merge/trees/trivial.c b/tests/merge/trees/trivial.c index bfd5dfed3..244cd3223 100644 --- a/tests/merge/trees/trivial.c +++ b/tests/merge/trees/trivial.c @@ -33,7 +33,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs git_buf branch_buf = GIT_BUF_INIT; git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT; - opts.automerge_flags |= automerge ? 0 : GIT_MERGE_AUTOMERGE_NONE; + opts.file_favor |= automerge ? 0 : GIT_MERGE_FILE_FAVOR_NO_MERGE; git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours); cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr)); |