Class: Conflict (private in Diff3

• Inheritance
• Description
• Related information
• Instance protocol
  • accessing
  • as yet unclassified
  • testing

Inheritance:

   Object
   |
   +--Diff3::Conflict

Package:

stx:libtool

Category:

Collections-Sequenceable-Diff

Owner:

Diff3

Author:

Tony Garnock-Jones <tonyg@lshift.com>

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:

 at: side

Given a side (#left, #original or #right), returns the
corresponding chunk

 at: side put: chunk

Given a side (#left, #original or #right), sets the
corresponding chunk

 left

 left: anObject

 leftAt: index

 length

 original

 original: anObject

 originalAt: index

 right

 right: anObject

 rightAt: index

 = otherConflict

(comment from inherited method)
return true if the receiver and the arg have the same structure.
Notice:
This method is partially open coded (inlined) by the compiler(s)
identical objects are always considered equal.
redefining it may not work as expected.

 accept: aVisitor

 printOn: aStream

 isChunk

 isConflict

 isInsertionInLeft

 isInsertionInOriginal

 isInsertionInRight