I normally do this in my text editor.  This should probably get a longer discussion of what the marked up failed-merge files look like.