DESCRIPTION

[historyView] Prevent nested merge and cherry-pick

When a merge, cherry-pick or rebase is already in progress the commands
merge and cherry-pick need to be disabled since we can't nest these
operations.

Change-Id: I358e9ef787de93c92ce12d3c9a320ec5dc928e66
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2013-08-29 23:39:24.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/150/

-------------------------------------
author: Brenden Conley
date: 2013-08-29 23:51:49.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/150/ : UNSTABLE

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