DESCRIPTION

Make Merge Tool also usable for conflicts of unstashing

Use index entries (2 and 3) for merge editor sides. This way, it is also
usable for conflicts of "stash apply". There should be no difference for
merge/rebase conflicts.

Bug: 376135
Change-Id: Ib9ac9ecd1a9f96217965cd288bc90fa377aad63b


COMMENTS

author: Juliet Cantu
date: 2013-01-29 00:05:56.000000000

Patch Set 1: Looks good to me, but someone else must approve; IP review completed

Looks reasonable

-------------------------------------
author: Juliet Cantu
date: 2013-01-29 22:09:38.000000000

Patch Set 1: Looks good to me, approved



-------------------------------------
author: Juliet Cantu
date: 2013-01-29 22:10:07.000000000

Patch Set 1: Verified

Verififed: works for me

-------------------------------------
author: Juliet Cantu
date: 2013-01-29 22:10:38.000000000

Change has been successfully merged into the git repository.

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