svn commit: r1802923 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core: DefaultThreeWayConflictHandlerOursTest.java DefaultThreeWayConflictHandlerTheirsTest.java ThreeWayConflictHandlerTest.java

Tue, 25 Jul 2017 05:19:08 -0700 

Author: stillalex
Date: Tue Jul 25 12:18:48 2017
New Revision: 1802923

URL: http://svn.apache.org/viewvc?rev=1802923&view=rev
Log:
OAK-6491 Add JCR_CREATED support to JcrLastModifiedConflictHandler
 - deletes did not pass


Removed:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultThreeWayConflictHandlerOursTest.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/DefaultThreeWayConflictHandlerTheirsTest.java
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ThreeWayConflictHandlerTest.java

Reply via email to