diff options
Diffstat (limited to 'tests/structinit/structinit.c')
| -rw-r--r-- | tests/structinit/structinit.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index 1df970d49..2942099dd 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -65,15 +65,20 @@ void test_structinit_structinit__compare(void) git_diff_find_options, GIT_DIFF_FIND_OPTIONS_VERSION, \ GIT_DIFF_FIND_OPTIONS_INIT, git_diff_find_init_options); - /* merge_tree */ + /* merge_file_input */ + CHECK_MACRO_FUNC_INIT_EQUAL( \ + git_merge_file_input, GIT_MERGE_FILE_INPUT_VERSION, \ + GIT_MERGE_FILE_INPUT_INIT, git_merge_file_init_input); + + /* merge_file */ 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_file_options, GIT_MERGE_FILE_OPTIONS_VERSION, \ + GIT_MERGE_FILE_OPTIONS_INIT, git_merge_file_init_options); - /* merge */ + /* merge_tree */ CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_opts, GIT_MERGE_OPTS_VERSION, \ - GIT_MERGE_OPTS_INIT, git_merge_init_opts); + git_merge_options, GIT_MERGE_OPTIONS_VERSION, \ + GIT_MERGE_OPTIONS_INIT, git_merge_init_options); /* push */ CHECK_MACRO_FUNC_INIT_EQUAL( \ |