DESCRIPTION

Use default preferences for preferred MergeStrategy

The default scope was not correctly taken into account.

Bug: 485385
Change-Id: If38c2c4402ae6b1d03e1dc471b3be3885432b995
Signed-off-by: Maleah Marks xxx@xxx.xxx

COMMENTS

author: Maleah Marks
date: 2016-01-22 09:58:24.000000000

Patch Set 2: Published edit on patch set 1

-------------------------------------
author: Brenden Conley
date: 2016-01-22 09:58:32.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2016-01-22 09:59:27.000000000

Patch Set 2: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/8066/ : FAILURE

-------------------------------------
author: Gerrit Johnathan Pham
date: 2016-02-05 08:23:02.000000000

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

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