Package com.intellij.diff.comparison

Class ComparisonMergeUtil

java.lang.Object

com.intellij.diff.comparison.ComparisonMergeUtil

public class ComparisonMergeUtil
extends java.lang.Object

Constructor Summary

Constructors

Constructor and Description
ComparisonMergeUtil()

Method Summary

Modifier and Type	Method and Description
static java.util.List<MergeRange>	buildMerge(FairDiffIterable fragments1, FairDiffIterable fragments2, com.intellij.diff.comparison.ComparisonMergeUtil.SideEquality trueEquality, ProgressIndicator indicator)
static java.util.List<MergeRange>	buildSimple(FairDiffIterable fragments1, FairDiffIterable fragments2, ProgressIndicator indicator)
static java.lang.CharSequence	tryResolveConflict(java.lang.CharSequence leftText, java.lang.CharSequence baseText, java.lang.CharSequence rightText)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ComparisonMergeUtil

public ComparisonMergeUtil()

Method Detail

buildSimple

public static java.util.List<MergeRange> buildSimple(FairDiffIterable fragments1,
                                                     FairDiffIterable fragments2,
                                                     ProgressIndicator indicator)

buildMerge

public static java.util.List<MergeRange> buildMerge(FairDiffIterable fragments1,
                                                    FairDiffIterable fragments2,
                                                    com.intellij.diff.comparison.ComparisonMergeUtil.SideEquality trueEquality,
                                                    ProgressIndicator indicator)

tryResolveConflict

public static java.lang.CharSequence tryResolveConflict(java.lang.CharSequence leftText,
                                                        java.lang.CharSequence baseText,
                                                        java.lang.CharSequence rightText)