Had a merge conflict so difficult that I copied the HEAD part into one new file and the other branch part into another new file, ran gvimdiff on the two files, figured things out in there, then copied the result back into the conflicting file.