question: @ Override public ConflictResults parseOutput ( final String stdout , final String stderr ) { final List < String > contentConflicts = new ArrayList < String > ( ) ; final List < String > renameConflicts = new ArrayList < String > ( ) ; final List < String > bothConflicts = new ArrayList < String > ( ) ; final String [ ] lines = getLines ( stderr ) ; for ( final String line : lines ) { final int index = line . lastIndexOf ( ":" ) ; if ( index != - 1 ) { if ( StringUtils . endsWith ( line , BOTH_CONFLICTS_SUFFIX ) ) { bothConflicts . add ( line . substring ( 0 , index ) ) ; } else if ( StringUtils . endsWith ( line , RENAME_CONFLICT_SUFFIX ) ) { renameConflicts . add ( line . substring ( 0 , index ) ) ; } else { contentConflicts . add ( line . substring ( 0 , index ) ) ; } } } return new ConflictResults ( contentConflicts , renameConflicts , bothConflicts ) ; }
target:  Outputs the conflicts found in the workspace in the following format: <p/> tfsTest_01/addFold/testHere2: The item content has changed tfsTest_01/TestAdd.txt: The item content has changed