commit 3307dd27d3b9bb85eaa25f4386b8e80f0f5a0c04
author Philip Langer <planger@eclipsesource.com> Mon Nov 20 13:50:47 2017 +0100
committer Camille Letavernier <cletavernier@eclipsesource.com> Wed Nov 29 09:05:12 2017 -0500
tree 8f288d7dd001bce2c15cbcd34dcb6bf4b05fa8c7
parent 60dee2e8988136730007190c0a130065f54a67e0

Use Papyrus Compare's scalable conflict detector by default

Change-Id: I80294ce7c373b7adb12af99f1c897fd38353847c
Signed-off-by: Philip Langer <planger@eclipsesource.com>

releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini

diff --git a/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini b/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
index c27e8d7..dc5b489 100755
--- a/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
+++ b/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
@@ -33,6 +33,7 @@
 # Configure collaborative modeling preferences
 org.eclipse.emf.compare.ide.ui/org.eclipse.emf.compare.ide.ui.preference.preMergeOnConflict=true
 org.eclipse.emf.compare.ide.ui/org.eclipse.emf.compare.ide.ui.preference.resolutionScope=WORKSPACE
+org.eclipse.emf.compare.rcp/org.eclipse.emf.compare.preference.conflict.detector=org.eclipse.emf.compare.rcp.fast.conflictDetector
 org.eclipse.egit.ui/enable_logical_model=true
 org.eclipse.egit.core/core_preferredMergeStrategy=model recursive