Bug 506631 - Enable pre-merge for model-based merging with conflicts
Change-Id: If8c690e1794049f15f9c548d7af1ebc458f589e9
Signed-off-by: Philip Langer <planger@eclipsesource.com>
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 a24935d..c27e8d7 100755
--- a/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
+++ b/releng/org.eclipse.papyrus.information.modeling.rcp/plugin_customization.ini
@@ -31,6 +31,7 @@
org.eclipse.papyrus.infra.gmfdiag.css/currentTheme=org.eclipse.papyrus.information.modeling.core.css.im_theme
# 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.egit.ui/enable_logical_model=true
org.eclipse.egit.core/core_preferredMergeStrategy=model recursive
