diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-22 17:00:09 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:05 -0500 |
| commit | fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3 (patch) | |
| tree | 53dbcd502af2400529a3f8db828612d90d12cf06 /tests/cherrypick | |
| parent | c4f60543b7ccfce852ebdc8c12b62c99a5d4c2a5 (diff) | |
| download | libgit2-fa78782f67d17c5b139a2bbe3ceefe54c8c71dd3.tar.gz | |
merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`
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 787f1f4d4..2b45f5a33 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.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_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.tree_flags |= GIT_MERGE_TREE_FIND_RENAMES; + opts.merge_opts.flags |= GIT_MERGE_FIND_RENAMES; opts.merge_opts.rename_threshold = 50; git_oid_fromstr(&head_oid, "44cd2ed2052c9c68f9a439d208e9614dc2a55c70"); |