diff options
| author | Jacques Germishuys <jacquesg@striata.com> | 2015-03-12 13:29:47 +0300 |
|---|---|---|
| committer | Jacques Germishuys <jacquesg@striata.com> | 2015-03-16 10:53:27 +0300 |
| commit | f29dde682866c293292ce405fcfef1511ced3f55 (patch) | |
| tree | 7a75fd6c5e4c907f44776ee88236c8a98438ff73 /tests/cherrypick | |
| parent | 0f24cac2b926e4842f6890ee1712ac2d85cc020c (diff) | |
Renamed git_merge_options 'flags' to 'tree_flags'
Diffstat (limited to 'tests/cherrypick')
| -rw-r--r-- | tests/cherrypick/workdir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/cherrypick/workdir.c b/tests/cherrypick/workdir.c index f8b4ca2e9..787f1f4d4 100644 --- a/tests/cherrypick/workdir.c +++ b/tests/cherrypick/workdir.c @@ -300,7 +300,7 @@ void test_cherrypick_workdir__rename(void) { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 0, "file3.txt.renamed" }, }; - opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "cfc4f0999a8367568e049af4f72e452d40828a15"); @@ -335,7 +335,7 @@ void test_cherrypick_workdir__both_renamed(void) { 0100644, "28d9eb4208074ad1cc84e71ccc908b34573f05d2", 2, "file3.txt.renamed_on_branch" }, }; - opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "44cd2ed2052c9c68f9a439d208e9614dc2a55c70"); |