mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-06 07:47:18 +00:00
23 lines
604 B
C
23 lines
604 B
C
/*
|
|
* 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
|