diff options
| author | Ben Straub <bs@github.com> | 2014-01-03 17:38:34 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-03-06 09:44:51 -0800 |
| commit | 6affd71f33f9a9693425d6f3599ba1f25226c34b (patch) | |
| tree | 42127170b47c96ec55438920e812dc0d96568add /include/git2/merge.h | |
| parent | 8e5247203720de7abd084996c00afd6fb6f6cc21 (diff) | |
| download | libgit2-6affd71f33f9a9693425d6f3599ba1f25226c34b.tar.gz | |
git_checkout_opts -> git_checkout_options
Diffstat (limited to 'include/git2/merge.h')
| -rw-r--r-- | include/git2/merge.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/git2/merge.h b/include/git2/merge.h index dc89a0482..3563f35d5 100644 --- a/include/git2/merge.h +++ b/include/git2/merge.h @@ -150,11 +150,11 @@ typedef struct { git_merge_tree_opts merge_tree_opts; /** Options for writing the merge result to the working directory. */ - git_checkout_opts checkout_opts; + git_checkout_options checkout_opts; } git_merge_opts; #define GIT_MERGE_OPTS_VERSION 1 -#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTS_INIT} +#define GIT_MERGE_OPTS_INIT {GIT_MERGE_OPTS_VERSION, 0, GIT_MERGE_TREE_OPTS_INIT, GIT_CHECKOUT_OPTIONS_INIT} /** * Initializes a `git_merge_opts` with default values. Equivalent to creating |