[platform-team-dev] How to use merge support for repos plugin

[Mikael Petterson <mikael.petterson@xxxxxxxxxxxx>]

Hi,

 

We have a plugin for repos and plan to use the "new" model based merge support.

 

I have read the info:

 

http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.platform.doc.isv%2Fguide%2Fteam.htm

 

As input I have the versions of a file that needs merge ( my private version, base version, branch version).

 

How can I make a simple input of files and see out test? Or does it require a dramatic change?

 

br,

 

//mike