[458544] Impossible to save value of text att if left not editable.19/40519/2
commita1a723b667fd37133b12c5f5d21f41cb071a03ee
authorLaurent Delaigue <laurent.delaigue@obeo.fr>
Wed, 28 Jan 2015 07:34:30 +0000 (28 08:34 +0100)
committerLaurent Delaigue <laurent.delaigue@obeo.fr>
Mon, 2 Feb 2015 15:01:17 +0000 (2 16:01 +0100)
treec42058c0e3c92499e70077d1a1cea8d7b9ff3be3
parent65f3da469604f76f85fef09e769884d572969a6e
[458544] Impossible to save value of text att if left not editable.

EMFCompareTextMergeViewer now checks the relevant side instead of always
checking the left side.

Bug: 458544
Change-Id: Ia3118f10d8ee280cf0d1a9b32a65c1366c043baf
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/configuration/ForwardingCompareConfiguration.java
plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/text/EMFCompareTextMergeViewer.java