| AbstractConflictSearch<T extends Diff> | Class in charge of finding conflicting diffs for a given diff of type T. | 
| AttributeChangeConflictSearch |  | 
| AttributeChangeConflictSearch.Add |  | 
| AttributeChangeConflictSearch.Change |  | 
| AttributeChangeConflictSearch.Delete |  | 
| AttributeChangeConflictSearch.Move |  | 
| ComparisonIndex | Index of diffs in a comparison. | 
| ConflictSearchFactory | Factory for ConflictSearch classes. | 
| ContainmentRefChangeConflictSearch |  | 
| ContainmentRefChangeConflictSearch.Add |  | 
| ContainmentRefChangeConflictSearch.Change |  | 
| ContainmentRefChangeConflictSearch.Delete |  | 
| ContainmentRefChangeConflictSearch.Move |  | 
| DiffTreeIterator | A custom iterator that will walk a Match->submatch tree, and allow iteration over the Diffs of these
 Matches. | 
| FeatureMapChangeConflictSearch |  | 
| FeatureMapChangeConflictSearch.Add |  | 
| FeatureMapChangeConflictSearch.Change |  | 
| FeatureMapChangeConflictSearch.Delete |  | 
| FeatureMapChangeConflictSearch.Move |  | 
| NonContainmentRefChangeConflictSearch |  | 
| NonContainmentRefChangeConflictSearch.Add |  | 
| NonContainmentRefChangeConflictSearch.Change |  | 
| NonContainmentRefChangeConflictSearch.Delete |  | 
| NonContainmentRefChangeConflictSearch.Move |  | 
| ResourceAttachmentChangeConflictSearch |  | 
| ResourceAttachmentChangeConflictSearch.Add |  | 
| ResourceAttachmentChangeConflictSearch.Change |  | 
| ResourceAttachmentChangeConflictSearch.Delete |  | 
| ResourceAttachmentChangeConflictSearch.Move |  |