Google Git
Sign in
eclipse / papyrus / org.eclipse.papyrus-collaborativemodeling / aca78d04b262a51437fa251c56f02981971ff804
commitaca78d04b262a51437fa251c56f02981971ff804[log] [tgz]
authorPhilip Langer <planger@eclipsesource.com>Wed Nov 22 17:00:15 2017 +0100
committerPhilip Langer <planger@eclipsesource.com>Wed Nov 22 17:01:11 2017 +0100
treeb4c0255be5d2d0ea11e40f4f796df30be63f55bc
parente515be158e96153e35330c3d25f235d1643d1c33 [diff]
Bug 512835 Allow opening Model Merge Tool from Papyrus node

Migrates EMF Compare change https://git.eclipse.org/r/#/c/92792/ to
Papyrus Compare.

With this change, users can open right-click menu -> Team -> Model Merge
Tool directly on the Papyrus model node.

Change-Id: Iebd5f22203d08ac4702b49e849c519f9ae6af4a4
Also-by: Simon Delisle <simon.delisle@ericsson.com>
Signed-off-by: Philip Langer <planger@eclipsesource.com>
17 files changed
tree: b4c0255be5d2d0ea11e40f4f796df30be63f55bc
  1. plugins/
  2. releng/
  3. tests/
  4. .gitattributes
  5. .gitignore
  6. .project
  7. CONTRIBUTING.md
  8. pom.xml
  9. README.MD
README.MD

Papyrus Collaborative Modeling

This is the collaborative modeling git repository

This repository is hosted at [Eclipse] (http://git.eclipse.org/c/papyrus/org.eclipse.papyrus-collaborativemodeling.git/)