diff options
| author | Philip Langer | 2017-11-20 12:52:46 +0000 |
|---|---|---|
| committer | Camille Letavernier | 2017-12-21 15:42:05 +0000 |
| commit | 4e52fa2d13ef92990c3b79af708d96b4a9c1d7b4 (patch) | |
| tree | bae81947f9107eaa5b13e0e3084720d3eaf0aee1 /releng | |
| parent | 6fe69f3e68f982ccb2383c32212c62943b82d16f (diff) | |
| download | org.eclipse.papyrus-4e52fa2d13ef92990c3b79af708d96b4a9c1d7b4.tar.gz org.eclipse.papyrus-4e52fa2d13ef92990c3b79af708d96b4a9c1d7b4.tar.xz org.eclipse.papyrus-4e52fa2d13ef92990c3b79af708d96b4a9c1d7b4.zip | |
Add Papyrus Compare preconfiguration to RCP
Change-Id: I2e62be54d15923c2239e66de8e45cc8ef8e8ebb9
Signed-off-by: Philip Langer <planger@eclipsesource.com>
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini b/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini index 731b27ba878..7af777843c6 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini +++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin_customization.ini @@ -18,3 +18,10 @@ org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight # show progress on startup org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true + +# Configure Papyrus Compare 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 |