Well I simply don't use the three way view. I find it easier to read when only having one window with the file having the <<< and >>> lines. As an aside, I also use the fugitive plugin and the promiscuous one which makes the whole process easier.