24#ifndef GIT_RESOLVE_CONFLICT_HANDLER_H
25#define GIT_RESOLVE_CONFLICT_HANDLER_H
GIT_RESOLVE_CONFLICT_HANDLER(git_repository *aRepository)
git_repository * m_repository
bool PerformResolveConflict()
#define APIEXPORT
Macros which export functions from a DLL/DSO.