[560957] Deadlock when using CDOMergingConflictResolver

https://bugs.eclipse.org/bugs/show_bug.cgi?id=560957
6 files changed