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
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2013-01-03 22:59:45.000000000

Uploaded patch set 4.

-------------------------------------
author: Douglas Trujillo
date: 2013-01-03 23:00:11.000000000

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

rebased

-------------------------------------
author: Douglas Trujillo
date: 2013-01-03 23:00:13.000000000

Change has been successfully merged into the git repository.

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