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-19 05:12:19.000000000

Patch Set 3: Verified+1 Code-Review+1

-------------------------------------
author: Brenden Conley
date: 2014-07-19 05:20:11.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-19 05:36:01.000000000

Patch Set 3: Verified+1

Build Successful 

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

-------------------------------------
author: Danika Greer
date: 2014-07-24 14:40:59.000000000

Patch Set 4: Patch Set 3 was rebased

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