DESCRIPTION

[wip] Introduces a modelMergeStrategy extension point.

Also a preference page for users to select the strategy they want, and
makes sure that relevant operations use the preferred strategy.

Change-Id: I4d455ce171cca13c780e72b8d27dd929b28c6b71
Signed-off-by: Maleah Marks xxx@xxx.xxx


COMMENTS

author: Maleah Marks
date: 2015-06-09 15:41:30.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2015-06-09 15:58:32.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/7117/

-------------------------------------
author: Brenden Conley
date: 2015-06-09 16:22:02.000000000

Patch Set 2: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/7117/ : UNSTABLE

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-08-31 09:36:26.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
