thodg/libgit2/src/merge_file.h
Tag
-
Show log
Commit
-
Hash : 05d47768
Author :
Date : 2014-03-10T22:30:41
Introduce git_merge_file for consumers
-
src/merge_file.h
-
/* * Copyright (C) the libgit2 contributors. All rights reserved. * * 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_filediff_h__ #define INCLUDE_filediff_h__ #include "xdiff/xdiff.h" #include "git2/merge.h" #endif