result.add(1, 0, 0, ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); return result; } else if (theirs.size() == 0) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(2, 0, 0, ConflictState.NO_CONFLICT); return result; result.add(0, current, oursEdit.getBeginA(), ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); result.add(0, current, theirsEdit.getBeginA(), ConflictState.NO_CONFLICT);
result.add(1, 0, 0, ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); return result; } else if (theirs.size() == 0) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(2, 0, 0, ConflictState.NO_CONFLICT); return result; result.add(0, current, oursEdit.getBeginA(), ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); result.add(0, current, theirsEdit.getBeginA(), ConflictState.NO_CONFLICT);
result.add(1, 0, 0, ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); } else result.add(1, 0, 0, ConflictState.NO_CONFLICT); return result; } else if (theirs.size() == 0) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); } else result.add(2, 0, 0, ConflictState.NO_CONFLICT); return result; result.add(0, current, oursEdit.getBeginA(), ConflictState.NO_CONFLICT); result.add(1, oursEdit.getBeginB(), oursEdit.getEndB(), ConflictState.NO_CONFLICT); current = oursEdit.getEndA(); result.add(0, current, theirsEdit.getBeginA(), ConflictState.NO_CONFLICT);