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.

Bug: 418151
Change-Id: I4d455ce171cca13c780e72b8d27dd929b28c6b71
Signed-off-by: Maleah Marks xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-08-30 20:39:41.000000000

Uploaded patch set 9.

-------------------------------------
author: Brenden Conley
date: 2015-08-30 20:39:47.000000000

Patch Set 9:

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

-------------------------------------
author: Brenden Conley
date: 2015-08-30 21:01:39.000000000

Patch Set 9: Verified+1

Build Successful 

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

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