Hi, On Wed, 11 Mar 2009, Daniel Barkalow wrote: > One thing that I think would be good whenever possible is to have the > merge program generate a file in the same format which is easily > recognizable as having conflict markers. For example, I think it should > be possible to show conflicts in the text of office documents by having > styles for each side of the merge, and show each side's content in the > appropriate style. Then the user opens the document with their choice of > office software, finds the things in the conflict styles, and decides > what the result should be. That's a very good idea! (Except for LaTeX, maybe...) For SVG, you could add both versions of a modified object, for example, maybe with some visual effect to show the version... Ciao, Dscho -- 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
