ConflictFreeLog: fix incremental conflict resolution
This is currently required for NEO.
Showing
This is currently required for NEO.
mentioned in commit 00acd95f
·mentioned in commit 00acd95f
mentioned in commit fe78ac9c
·mentioned in commit fe78ac9c