diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-23 15:42:09 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-24 20:24:37 -0500 |
| commit | 632d8b230bf38cc61cd70b55a54ae2f52502b4af (patch) | |
| tree | 38a8c4825ab59511951b586edb434a5240f3dc9f /src/merge.h | |
| parent | 6f6b0c013c6eff2aca2a7ada1027044f2e20f578 (diff) | |
| download | libgit2-632d8b230bf38cc61cd70b55a54ae2f52502b4af.tar.gz | |
reset changes for merge
Diffstat (limited to 'src/merge.h')
| -rw-r--r-- | src/merge.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h new file mode 100644 index 000000000..2117d9214 --- /dev/null +++ b/src/merge.h @@ -0,0 +1,19 @@ +/* + * 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 |