Simplify display of conflict objects
commite9344172ffe833e74d4e26fe644f36e966c44b06
authorMikaël Barbero <mikael.barbero@obeo.fr>
Wed, 14 Aug 2013 13:51:40 +0000 (14 15:51 +0200)
committerMikaël Barbero <mikael.barbero@obeo.fr>
Wed, 14 Aug 2013 13:51:40 +0000 (14 15:51 +0200)
tree6644acdb792be50b7275acdfa7e9ef780a9eee4e
parenta18ee80862fa1d6f6824a5ecf17ed770ae405d33
Simplify display of conflict objects
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/internal/edit_messages.properties
plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java