Have you ever merge XML? I tried - it is horrible work.
It depends entirely on how the XML document is formatted. There's nothing that prevents XML with sensible line breaks, for example.
I keep lots of XHTML documents in CVS. They're well-formatted, so merging works just fine.
-- Michael Wojcik Micro Focus Rhetoric & Writing, Michigan State University