DESCRIPTION

Ensure that preferred merge strategy is stored in core preferences

Bug: 476449
Change-Id: I46817efa4ec7d82fb97e7e265a20b6ca1bd3dc64
Signed-off-by: Maleah Marks xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-09-03 22:38:17.000000000

Uploaded patch set 2.

-------------------------------------
author: Douglas Trujillo
date: 2015-09-03 22:38:59.000000000

Patch Set 2: Code-Review+2

- rebased
- improved comment and commit message

-------------------------------------
author: Brenden Conley
date: 2015-09-03 23:23:21.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-09-03 23:46:27.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Maleah Marks
date: 2015-09-04 06:19:18.000000000

Patch Set 2: Code-Review+1

Thank you for the review Matthias, it looks fine.

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-09-04 07:15:19.000000000

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

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