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: Douglas Trujillo
date: 2013-09-04 16:18:04.000000000

Uploaded patch set 3.

-------------------------------------
author: Brenden Conley
date: 2013-09-04 16:18:10.000000000

Patch Set 3:

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

-------------------------------------
author: Brenden Conley
date: 2013-09-04 16:35:12.000000000

Patch Set 3: Code-Review-1

Build Unstable 

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

-------------------------------------
author: Douglas Trujillo
date: 2013-09-04 16:38:36.000000000

Patch Set 3: Verified+1 Code-Review+2 IP-Clean+1

-------------------------------------
author: Douglas Trujillo
date: 2013-09-04 16:38:38.000000000

Change has been successfully merged into the git repository.

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