diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2014-03-10 22:30:41 -0800 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-16 18:02:12 -0700 |
| commit | 8c062d51af841c11cc95ebb34d95ee4d71621d09 (patch) | |
| tree | 82e0a8b3613a0167329927a513bbd2bd67adfa1d /tests/structinit/structinit.c | |
| parent | 2b40390f226ac8ba516fdf0d893e0b5a29857dc7 (diff) | |
| download | libgit2-ed/merge_file.tar.gz | |
Introduce git_merge_file for consumersed/merge_file
Diffstat (limited to 'tests/structinit/structinit.c')
| -rw-r--r-- | tests/structinit/structinit.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index 1df970d49..61fe8c786 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -65,6 +65,16 @@ 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_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_file_options, GIT_MERGE_FILE_OPTIONS_VERSION, \ + GIT_MERGE_FILE_OPTIONS_INIT, git_merge_file_init_options); + /* merge_tree */ CHECK_MACRO_FUNC_INIT_EQUAL( \ git_merge_tree_opts, GIT_MERGE_TREE_OPTS_VERSION, \ |