final QSequenceDifferenceBlock localStartBlock = local.current(); final QSequenceDifferenceBlock latestStartBlock = latest.current(); if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) { baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(), localLines, latestLines, baseLineIndex, transformedLocalLines); local.forward();
final QSequenceDifferenceBlock localStartBlock = local.current(); final QSequenceDifferenceBlock latestStartBlock = latest.current(); if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) { baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(), localLines, latestLines, baseLineIndex, transformedLocalLines); local.forward();
final QSequenceDifferenceBlock localStartBlock = local.current(); final QSequenceDifferenceBlock latestStartBlock = latest.current(); if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) { if (style == SVNDiffConflictChoiceStyle.CHOOSE_LATEST) { baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines);
final QSequenceDifferenceBlock localStartBlock = local.current(); final QSequenceDifferenceBlock latestStartBlock = latest.current(); if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) { if (style == SVNDiffConflictChoiceStyle.CHOOSE_LATEST) { baseLineIndex = createConflict(result, localStartBlock, local.current(), latestStartBlock, latest.current(),