This is pretty atrocious, to be honest.  I cannot think of any tool that does this bad a job at handling merge conflicts, period.  Even diff/patch .rej files are superior.