diff options
| author | Vicent Marti <tanoku@gmail.com> | 2013-04-16 19:46:41 +0400 |
|---|---|---|
| committer | Vicent Marti <tanoku@gmail.com> | 2013-04-16 19:46:41 +0400 |
| commit | a50086d174658914d4d6462afbc83b02825b1f5b (patch) | |
| tree | e8daa1c7bf678222cf351445179837bed7db3a72 /src/merge.h | |
| parent | 5b9fac39d8a76b9139667c26a63e6b3f204b3977 (diff) | |
| parent | f124ebd457bfbf43de3516629aaba5a279636e04 (diff) | |
Merge branch 'development'v0.18.0
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h new file mode 100644 index 000000000..22c644270 --- /dev/null +++ b/src/merge.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) the libgit2 contributors. All rights reserved. + * + * This file is part of libgit2, distributed under the GNU GPL v2 with + * a Linking Exception. For full terms see the included COPYING file. + */ +#ifndef INCLUDE_merge_h__ +#define INCLUDE_merge_h__ + +#include "git2/types.h" +#include "git2/merge.h" +#include "commit_list.h" +#include "vector.h" + +#define GIT_MERGE_MSG_FILE "MERGE_MSG" +#define GIT_MERGE_MODE_FILE "MERGE_MODE" + +#define MERGE_CONFIG_FILE_MODE 0666 + +int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos); + +#endif |