I could easily see the differences between two versions of the same HTML file, and merge them any way I wanted to. Beyond Compare also has a feature for finding differences between image files.