Fixed

TEST-org.eclipse.emf.compare.rcptt.test.ts010_tc102_3-way_conflicts

Took 12 sec.