DESCRIPTION

Introduce a mergeStrategy extension point.

Preference page for users to select the strategy they want.
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-08-28 09:55:58.000000000

Uploaded patch set 7.

-------------------------------------
author: Brenden Conley
date: 2015-08-28 09:56:04.000000000

Patch Set 7:

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

-------------------------------------
author: Brenden Conley
date: 2015-08-28 10:13:36.000000000

Patch Set 7: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7475/ : 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

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