Patch Set 1:

I don't seem to be able to reproduce this. First of all, I can't find the egit change you are referring to. I tried to search with both "change:Ie694e09b" and "Ie694e09b" with no result.
I tried a few combinations with parallel changes on the same line of the same file in two branches but didn't see the behavior you are describing.