FilesExpand file tree

development

/

merge.h

Copy path

Blame

More file actions

Blame

More file actions

Latest commit

 

History

History

History

22 lines (17 loc) · 618 Bytes

development

/

merge.h

Copy path

Top

File metadata and controls

• Code
• Blame

22 lines (17 loc) · 618 Bytes

Raw

Copy raw file

Download raw file

Open symbols panel

Edit and raw actions

1

2

3

4

5

6

7

8

9

10

11

12

13

14

15

16

17

18

19

20

21

22

/*

* Copyright (C) 2009-2012 the libgit2 contributors

*

* 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"

#define GIT_MERGE_MSG_FILE "MERGE_MSG"

#define GIT_MERGE_MODE_FILE "MERGE_MODE"

#define MERGE_CONFIG_FILE_MODE 0666

int git_merge__cleanup(git_repository *repo);

int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos);

#endif