Try Beyond Compare (I'm not affiliated, just a longtime customer). I just went through each test case and had no problems. Resolving one of the standard conflic

Try Beyond Compare (I'm not affiliated, just a longtime customer). I just went through each test case and had no problems. Resolving one of the standard conflicts involved using 'align with <F7>' to separate the changes at the end of the file. Most of the pathological cases were solved automatically and without even conflict markers, and when they weren't, selecting a hunk, right clicking, and choosing 'take left then right' worked.