void function ( ) { assertEquals ( t ( "srini_string" ) , merge ( "srini_string" , "srini_string" , "srini_string" ) ) ; }
check for a conflict where the second text was changed similar to the first one , but the second texts modification covers one more line . concode_field_sep MergeFormatter fmt concode_elem_sep boolean newlineAtEnd concode_elem_sep boolean[] newlineAtEndDataPoints concode_field_sep void testSeparateModifications concode_elem_sep void testEmptyTexts concode_elem_sep void testTwoComplicatedModifications concode_elem_sep void testTwoSimilarModsAndOneInsert concode_elem_sep void testConflictAtEnd concode_elem_sep void testSameModification concode_elem_sep void testAdjacentModifications concode_elem_sep void testTwoSimilarModsAndOneInsertAtEndNoNewlineAtEnd concode_elem_sep String t concode_elem_sep RawText T concode_elem_sep void testOneAgainstTwoConflictingModifications concode_elem_sep void testConflictAtStart concode_elem_sep void testDeleteVsModify concode_elem_sep String merge concode_elem_sep void testNoAgainstOneModification concode_elem_sep void testTwoSimilarModsAndOneInsertAtEnd concode_elem_sep void testTwoNonConflictingModifications concode_elem_sep void testBlankLines concode_elem_sep void testInsertVsModify