Generated by
JDiff

Class org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff

Changed Methods
void changeDeletedNode(NodeBuilder, String, NodeState, NodeState) Change in signature from (NodeBuilder, String, NodeState) to (NodeBuilder, String, NodeState, NodeState).
 
void changeDeletedProperty(NodeBuilder, PropertyState, PropertyState) Change in signature from (NodeBuilder, PropertyState) to (NodeBuilder, PropertyState, PropertyState).
 
 

Added Fields
String BASE  
String OURS