KIGIT::MERGE_BLOBS Struct Reference

Decoded ancestor/ours/theirs blob contents for a 3-way merge driver. More...

#include <kigit_merge_blob_utils.h>

Public Attributes
std::string	ancestor
	Empty when there is no common ancestor.
std::string	ours
std::string	theirs

Detailed Description

Decoded ancestor/ours/theirs blob contents for a 3-way merge driver.

Definition at line 53 of file kigit_merge_blob_utils.h.

Member Data Documentation

ancestor

std::string KIGIT::MERGE_BLOBS::ancestor

Empty when there is no common ancestor.

Definition at line 55 of file kigit_merge_blob_utils.h.

Referenced by KIGIT::LoadMergeBlobs(), KIGIT_PCB_MERGE::Merge(), and KIGIT::TryTrivialMerge().

ours

std::string KIGIT::MERGE_BLOBS::ours

Definition at line 56 of file kigit_merge_blob_utils.h.

Referenced by KIGIT::LoadMergeBlobs(), KIGIT_PCB_MERGE::Merge(), KIGIT_TRIVIAL_MERGE_BASE< DERIVED >::Merge(), and KIGIT::TryTrivialMerge().

theirs

std::string KIGIT::MERGE_BLOBS::theirs

Definition at line 57 of file kigit_merge_blob_utils.h.

Referenced by KIGIT::LoadMergeBlobs(), KIGIT_PCB_MERGE::Merge(), and KIGIT::TryTrivialMerge().

---

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

• kigit_merge_blob_utils.h