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

(1 inline comment)

Thanks for the improvements.

I tried with a real world merge trying to resolve the conflicts raised when I (using native git) merged the current egit origin/master (cb2e630b) into egit change 1692, patchset 1 (3e494ae2) and found some more issues. 
I started the merge tool with the option HEAD (unmerged) :
- the progress bar reveals that the merge tool seems not to skip class files under the bin folder which could be skipped according to ignore rules
- the merge tool displays files which are displayed as "staged" in the package explorere but they don't show any difference in the merge tool
- when closing the merge tool and trying to re-open it I can't since the merge tool menu entry is grayed out
- to try again I did a hard reset and retried - this time using egit to merge - interestingly egit claims that it can do the merge without conflicts, I suspect this points at some error in egit's merge
- so I again reset and retried - again using native git for the merge - and using the "pre-merged" option. Looking at the Java Structure compare for UIText.java this looks not consistent with what the text compare shows