diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 18:40:38 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:07 -0700 |
| commit | 02105a27f01509ce4e641487cae040662ee477a2 (patch) | |
| tree | c39db31754e115473ebbe92a9f35bf5703d714c6 /tests/structinit/structinit.c | |
| parent | 1c0b6a38bacb54de300d936338d4adb04a9b311f (diff) | |
| download | libgit2-02105a27f01509ce4e641487cae040662ee477a2.tar.gz | |
Change signature of `git_merge` to take merge and checkout opts
Diffstat (limited to 'tests/structinit/structinit.c')
| -rw-r--r-- | tests/structinit/structinit.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index 61fe8c786..fc44898cc 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -80,11 +80,6 @@ void test_structinit_structinit__compare(void) git_merge_tree_opts, GIT_MERGE_TREE_OPTS_VERSION, \ GIT_MERGE_TREE_OPTS_INIT, git_merge_tree_init_opts); - /* merge */ - CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_opts, GIT_MERGE_OPTS_VERSION, \ - GIT_MERGE_OPTS_INIT, git_merge_init_opts); - /* push */ CHECK_MACRO_FUNC_INIT_EQUAL( \ git_push_options, GIT_PUSH_OPTIONS_VERSION, \ |