eclipse / papyrus / org.eclipse.papyrus-collaborativemodeling / 9f8fddd820e0f9f4488f1dbebce270d97bab2ba6 / . / compare / tests / org.eclipse.papyrus.compare.diagram.tests.git / src / org / eclipse / papyrus / compare / diagram / tests / merge / data / additive / conflicts / test2 / commit2