DESCRIPTION

Make it possible to choose merge strategy before merges

This commit makes it possible to optionally select a specific merge
strategy before merge, cherry-pick and rebase operations, if they are
called from a menu that already displayed a dialog.
To make it as little intrusive as possible, the list of available merge
strategies is not displayed by default.

Change-Id: I7e3fa7a00f616905a2005f58fdf46998866ce26f
Signed-off-by: Maleah Marks xxx@xxx.xxx

COMMENTS

author: Maleah Marks
date: 2016-06-21 07:13:49.000000000

Uploaded patch set 4.

-------------------------------------
author: Brenden Conley
date: 2016-06-21 07:13:55.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2016-06-21 07:39:00.000000000

Patch Set 4: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/8747/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2016-06-24 13:19:29.000000000

Patch Set 4: -Code-Review

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

-------------------------------------
author: Brenden Conley
date: 2016-06-24 13:49:07.000000000

Patch Set 4: Verified+1

Build Successful 

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

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