DESCRIPTION

Show an explanation when a merge is not possible

* Explain the reason the merge has failed instead of just showing an
exception dialog "Cannot merge now".
* Consolidate duplicate code into MergeActionHandler

Change-Id: Ibdf1f9f7d3cdd55fae41c88eafeb0e6708ecfe42
Signed-off-by: Clare Clay xxx@xxx.xxx


COMMENTS

author: Danika Greer
date: 2014-07-24 14:41:09.000000000

Patch Set 4: Verified+1 Code-Review+2

-------------------------------------
author: Danika Greer
date: 2014-07-24 14:41:11.000000000

Change has been successfully merged into the git repository.

-------------------------------------
author: Brenden Conley
date: 2014-07-24 15:00:53.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-24 15:20:21.000000000

Patch Set 4:

Build Successful 

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

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