GIT_RESOLVE_CONFLICT_HANDLER Class Reference

#include <git_resolve_conflict_handler.h>

Public Member Functions
	GIT_RESOLVE_CONFLICT_HANDLER (git_repository *aRepository)
virtual	~GIT_RESOLVE_CONFLICT_HANDLER ()
bool	PerformResolveConflict ()

Private Attributes
git_repository *	m_repository

Detailed Description

Definition at line 32 of file git_resolve_conflict_handler.h.

Constructor & Destructor Documentation

GIT_RESOLVE_CONFLICT_HANDLER()

GIT_RESOLVE_CONFLICT_HANDLER::GIT_RESOLVE_CONFLICT_HANDLER

(

git_repository *

aRepository

)

Definition at line 26 of file git_resolve_conflict_handler.cpp.

References m_repository.

~GIT_RESOLVE_CONFLICT_HANDLER()

GIT_RESOLVE_CONFLICT_HANDLER::~GIT_RESOLVE_CONFLICT_HANDLER ( )

virtual

Definition at line 32 of file git_resolve_conflict_handler.cpp.

Member Function Documentation

PerformResolveConflict()

bool GIT_RESOLVE_CONFLICT_HANDLER::PerformResolveConflict

(

)

Definition at line 37 of file git_resolve_conflict_handler.cpp.

Referenced by PROJECT_TREE_PANE::onGitResolveConflict().

Member Data Documentation

m_repository

git_repository* GIT_RESOLVE_CONFLICT_HANDLER::m_repository

private

Definition at line 41 of file git_resolve_conflict_handler.h.

Referenced by GIT_RESOLVE_CONFLICT_HANDLER().

---

The documentation for this class was generated from the following files:

• git_resolve_conflict_handler.h
• git_resolve_conflict_handler.cpp