commit 0b9bb74d1af822dd06a77b66ef5af101ef29af3f
author Martin Fleck <mfleck@eclipsesource.com> Wed Mar 22 15:43:31 2017 +0100
committer Laurent Goubet <laurent.goubet@obeo.fr> Tue May 09 10:08:48 2017 -0400
tree b7ce2b88adae974b22e0e979dbfe32265521d2d4
parent 237891798f6e45ea75fc67a8ed2728fc7fe6fd9a

[514079] Default to TextMergeViewer resources for icons/labels/tooltips 

- Wrap the resource bundle of an EMF Compare content merge viewer to
default to the Eclipse Compare TextMergeViewer resources for any
non-defined key to avoid re-definition problems, e.g., different values
on different platforms.

- Remove defined, identical key-value pairs for toolbar actions from the
properties of the content merge viewers.

Bug: 514079
Change-Id: I9e17bebc2ff16f830cc4812ba16acca274d773fb
Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>