[libgit2.git] / src / merge.h

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

#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);

#endif
Commit	Line	Data
632d8b23 ET	1	/*
	2	* Copyright (C) 2009-2012 the libgit2 contributors
	3	*
	4	* This file is part of libgit2, distributed under the GNU GPL v2 with
	5	* a Linking Exception. For full terms see the included COPYING file.
	6	*/
	7	#ifndef INCLUDE_merge_h__
	8	#define INCLUDE_merge_h__
	9
	10	#include "git2/types.h"
	11
	12	#define GIT_MERGE_MSG_FILE "MERGE_MSG"
	13	#define GIT_MERGE_MODE_FILE "MERGE_MODE"
	14
	15	#define MERGE_CONFIG_FILE_MODE 0666
	16
	17	int git_merge__cleanup(git_repository *repo);
	18
	19	#endif