diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 22:47:39 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:08 -0700 |
| commit | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (patch) | |
| tree | 350898e99181e7b2c7d6db4da667d384ef90ef49 /tests/structinit | |
| parent | 02105a27f01509ce4e641487cae040662ee477a2 (diff) | |
| download | libgit2-5aa2ac6de1622308884fd542f7b29e6810a0e98e.tar.gz | |
Update git_merge_tree_opts to git_merge_options
Diffstat (limited to 'tests/structinit')
| -rw-r--r-- | tests/structinit/structinit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index fc44898cc..2942099dd 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -77,8 +77,8 @@ void test_structinit_structinit__compare(void) /* merge_tree */ CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_tree_opts, GIT_MERGE_TREE_OPTS_VERSION, \ - GIT_MERGE_TREE_OPTS_INIT, git_merge_tree_init_opts); + git_merge_options, GIT_MERGE_OPTIONS_VERSION, \ + GIT_MERGE_OPTIONS_INIT, git_merge_init_options); /* push */ CHECK_MACRO_FUNC_INIT_EQUAL( \ |