src/merge.h

   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 #include "git2/merge.h"
  12 #include "commit_list.h"
  13 #include "vector.h"
  14
  15 #define GIT_MERGE_MSG_FILE              "MERGE_MSG"
  16 #define GIT_MERGE_MODE_FILE             "MERGE_MODE"
  17
  18 #define MERGE_CONFIG_FILE_MODE  0666
  19
  20 int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_list_node *one, git_vector *twos);
  21
  22 #endif