DESCRIPTION

Do not disable staged/unstaged viewers during merge

Do not disable viewers as they are used during merge/rebase. Instead,
added half busy cursor to indicate "work in progress" state.

Bug: 440758
Change-Id: Ia153de6a6f17d578d570178c60c8daba38dbd812
Signed-off-by: Jayvion Booth xxx@xxx.xxx

COMMENTS

author: Jayvion Booth
date: 2014-07-30 14:27:07.000000000

Uploaded patch set 1.

-------------------------------------
author: Danika Greer
date: 2014-07-30 14:32:36.000000000

Patch Set 1:

I think the following should work:

* Separating the disabling/enabling of the viewers into its own method
* In commit(), call this method in addition to enableCommitWidgets

-------------------------------------
author: Brenden Conley
date: 2014-07-30 16:30:37.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2014-07-30 16:47:45.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Danika Greer
date: 2014-07-31 13:42:42.000000000

Abandoned

See Ife0705c0f461f576da61cd3adfea8225bc202e03 for a better solution.

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