saurabh gupta wrote: >> exactly. and how you mark the conflict to have it be valid XML is >> going to depend on details of the type of file. there are probably >> a few basic methods that will work the vast majority of the time, >> but with some details needing to be configurable. >> >> for example, if the XML document is a ODF document, it may be >> possible to add 'revision' tags around the conflict that are >> already understood by the editor. > > Exactly. This includes the work to modify the xml tags and add > contents to represent marker in the best way. On the XML topic, one last thing to keep in mind is the DTD/XSD which governs the file. Rogan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
