org.eclipse.papyrus.compare.diagram.tests.egit.mergeresolution.MergeResolutionManagerTest.testNoConflicts (from org.eclipse.papyrus.compare.diagram.tests.suite.PapyrusGitTests)