| Method |
Description |
|
|
BothAddedSameDataDivElement_GetOurs ( ) : void |
|
|
|
BothDoSameEdit ( ) : void |
|
|
|
BothEditDifferentDataDivElements_GetBoth ( ) : void |
|
|
|
BothEditWithConflictAndWeWin ( ) : void |
|
|
|
CanMergeFile_HTM_True ( ) : void |
|
|
|
CanMergeFile_html_True ( ) : void |
|
|
|
CanMergeFile_xyz_False ( ) : void |
|
|
|
CanPresentAGoodFile ( ) : void |
|
|
|
CannotDiffAFile ( ) : void |
|
|
|
CannotPresentAFileWithOtherExtension ( ) : void |
|
|
|
CannotPresentANullFile ( ) : void |
|
|
|
CannotPresentAnEmptyFileName ( ) : void |
|
|
|
CannotValidateAFile ( ) : void |
|
|
|
DescribeInitialContentsShouldHaveAddedForLabel ( ) : void |
|
|
|
DoMerge ( string commonAncestor, string ourContent, string theirContent ) : MergeResult |
|
|
|
Find2WayDifferences_Throws ( ) : void |
|
|
|
GetExtensionsOfKnownTextFileTypesIsLiftRanges ( ) : void |
|
|
|
Merge_BothAddPagesWithUniqueIdsToEmptyDoc_AmbiguousConflict ( ) : void |
|
|
|
Merge_NobodyDidAnything_NoChange ( ) : void |
|
|
|
Merge_TheyEditWeDoNothing_GetTheirs ( ) : void |
|
|
|
Merge_WeEditTheyDoNothing_GetOurs ( ) : void |
|
|
|
ValidateFile_HasNoResultsForValidFile ( ) : void |
|
|
