thodg/libgit2/src/merge.h

• Show log

  Commit

• Hash : 632d8b23
  Author :
  Date : 2012-10-23T15:42:09
  

  reset changes for merge

Download

• 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
  

Download