![]() |
Smalltalk/X WebserverDocumentation of class 'Diff3::Conflict': |
|
Class: Conflict (private in Diff3This class is only visible from within Diff3.Inheritance:Object | +--Diff3::Conflict
Description:A Diff3Conflict represents a merge conflict. Instance Variables left: Either a SequenceableCollection or a Diff3Chunk representing the left variant. original: Either a SequenceableCollection or a Diff3Chunk representing the original variant. right: Either a SequenceableCollection or a Diff3Chunk representing the right variant. [instance variables:] [class variables:] Related information:Instance protocol:accessing
|
|
ST/X 7.2.0.0; WebServer 1.670 at bd0aa1f87cdd.unknown:8081; Fri, 29 Sep 2023 11:32:07 GMT
|