Fixed conflict resolution involving PersistentReferences
In short the merge method avoid to pickle or hash objects to perform the 3-way merge.
Edited by Éloi Rivard
In short the merge method avoid to pickle or hash objects to perform the 3-way merge.