DESCRIPTION

Also enable Merge Tool for conflicts caused by stash

Check index diff for conflicting files contained in the selection
instead of repository state. This should be more reliable.

This depends on the previous change for the ResourceUtil changes.

Bug: 376135
Change-Id: I9e14c491254ea1927c4b57989e8282d657945685


COMMENTS

author: Brenden Conley
date: 2012-10-20 22:32:50.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2012-10-20 22:47:57.000000000

Patch Set 1: Verified

Build Successful 

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

-------------------------------------
author: Danika Greer
date: 2012-12-23 19:10:00.000000000

Patch Set 1: Rebased

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