Uses of Class
com._1c.g5.v8.dt.compare.core.MergeResultDifference
-
Packages that use MergeResultDifference Package Description com._1c.g5.v8.dt.bsl.compare.merge com._1c.g5.v8.dt.compare.ui.mergeviewer -
-
Uses of MergeResultDifference in com._1c.g5.v8.dt.bsl.compare.merge
Method parameters in com._1c.g5.v8.dt.bsl.compare.merge with type arguments of type MergeResultDifference Modifier and Type Method Description static String
MergeFormattingSupport. merge(String mainModuleContent, String otherModuleContent, String ancestorModuleContent, MergeRule mergeRule, List<MergeResultDifference> mergeConflicts)
Runs 3-way merge for the given Bsl module text contents according to the special merge rule and collects merge conflicts. -
Uses of MergeResultDifference in com._1c.g5.v8.dt.compare.ui.mergeviewer
Methods in com._1c.g5.v8.dt.compare.ui.mergeviewer that return types with arguments of type MergeResultDifference Modifier and Type Method Description List<MergeResultDifference>
IThreeSideTextMergeInput. getMergeConflicts()
Returns the merge conflicts.List<MergeResultDifference>
ThreeSideTextMergeInput. getMergeConflicts()
Method parameters in com._1c.g5.v8.dt.compare.ui.mergeviewer with type arguments of type MergeResultDifference Modifier and Type Method Description void
IThreeSideTextMergeInput. setMergeConflicts(List<MergeResultDifference> mergeConflicts)
Sets the merge conflicts.void
ThreeSideTextMergeInput. setMergeConflicts(List<MergeResultDifference> conflicts)
-