baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); if (checkConflict(local, latest, localLines, latestLines, baseLines.getLineCount())) { if (style == SVNDiffConflictChoiceStyle.CHOOSE_LATEST) { baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); merged = true; } else if (style == SVNDiffConflictChoiceStyle.CHOOSE_MODIFIED) { baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); merged = true; baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines); latest.forward(); merged = true;
baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); merged = true; baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines); latest.forward(); merged = true;
baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); merged = true; baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines); latest.forward(); merged = true;
baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); latest.forward(); baseLineIndex = appendLines(result, local.current(), localLines, baseLineIndex, transformedLocalLines); local.forward(); merged = true; baseLineIndex = appendLines(result, latest.current(), latestLines, baseLineIndex, transformedLocalLines); latest.forward(); merged = true;