ConflictData Struct Reference

#include <git_pull_handler.h>

Public Attributes
std::string	filename
std::string	our_status
std::string	their_status
git_oid	our_oid
git_oid	their_oid
git_time_t	our_commit_time
git_time_t	their_commit_time
bool	use_ours

Detailed Description

Definition at line 55 of file git_pull_handler.h.

Member Data Documentation

filename

std::string ConflictData::filename

Definition at line 57 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

our_commit_time

git_time_t ConflictData::our_commit_time

Definition at line 62 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

our_oid

git_oid ConflictData::our_oid

Definition at line 60 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

our_status

std::string ConflictData::our_status

Definition at line 58 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

their_commit_time

git_time_t ConflictData::their_commit_time

Definition at line 63 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

their_oid

git_oid ConflictData::their_oid

Definition at line 61 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

their_status

std::string ConflictData::their_status

Definition at line 59 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

use_ours

bool ConflictData::use_ours

Definition at line 64 of file git_pull_handler.h.

Referenced by GIT_PULL_HANDLER::handleMerge().

---

The documentation for this struct was generated from the following file:

• git_pull_handler.h