EMF Diff/Merge is a diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components and sample higher-level tools, such as support for modeling patterns, are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
This is the Neon release of EMF Diff/Merge. It includes contributions related to the integration with Eclipse Team and Eclipse SCM clients (EGit, Subversive).