DESCRIPTION

Try to fix unstable MergeToolTest

It might be possible that the index diff cache was not yet used, so get
it before relying on it in isEnabled check of MergeToolActionHandler.

Change-Id: Ia5711956fff88103a64dd1e2cc1848fbea06e706


COMMENTS

author: Brenden Conley
date: 2013-04-12 13:21:37.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2013-04-12 13:38:19.000000000

Patch Set 1: I would prefer that you didn't submit this

Build Unstable 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4358/ : UNSTABLE

-------------------------------------
author: Brenden Conley
date: 2013-04-12 13:53:55.000000000

Patch Set 1: No score

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

-------------------------------------
author: Brenden Conley
date: 2013-04-12 14:09:43.000000000

Patch Set 1: Verified

Build Successful 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4359/ : SUCCESS

-------------------------------------
author: Danika Greer
date: 2013-04-12 14:21:19.000000000

Patch Set 1: Verified; Looks good to me, approved; IP review completed



-------------------------------------
author: Danika Greer
date: 2013-04-12 14:21:21.000000000

Change has been successfully merged into the git repository.

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