Made tryToResolveConflict available as stand-alone function.

src/ZODB/ConflictResolution.py

@@ -142,10 +142,7 @@ def persistent_id(object,
         return None
     return object.data
 
-class ConflictResolvingStorage:
-    "Mix-in class that provides conflict resolution handling for storages"
-
-    def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle):
+def tryToResolveConflict(self, oid, committedSerial, oldSerial, newpickle):
     #class_tuple, old, committed, newstate = ('',''), 0, 0, 0
     try:
         file=StringIO(newpickle)
@@ -199,3 +196,7 @@ class ConflictResolvingStorage:
 
         return 0
 
+class ConflictResolvingStorage:
+    "Mix-in class that provides conflict resolution handling for storages"
+
+    tryToResolveConflict=tryToResolveConflict