DESCRIPTION

[wip] Introduces a modelMergeStrategy extension point.

Also a preference page for users to select the strategy they want, and
make 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-15 15:51:48.000000000

Uploaded patch set 4.

-------------------------------------
author: Brenden Conley
date: 2015-06-15 15:51:55.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-15 16:10:40.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7126/ : SUCCESS

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

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

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