FilePersistence::MergeData Member List

This is the complete list of members for FilePersistence::MergeData, including all inherited members.

applyNonConflictingChanges()	FilePersistence::MergeData
cg_	FilePersistence::MergeData
softConflicts_	FilePersistence::MergeData
treeA_	FilePersistence::MergeData
treeB_	FilePersistence::MergeData
treeBase_	FilePersistence::MergeData
treeMerged_	FilePersistence::MergeData