Johannes Schindelin venit, vidit, dixit 12.03.2009 14:07: > Hi, > > On Thu, 12 Mar 2009, Michael J Gruber wrote: > >> Johannes Schindelin venit, vidit, dixit 11.03.2009 17:44: >> >>> 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...) >> latexdiff (in perl) may give you a head start (or ache, I dunno). > No. latexdiff is about diffing. It does nothing to help me resolve a > conflict. Sure. If you want to merge you have to diff first (and display it). That would be the "head start". Then you have to think about the merge. That's where the "head ache" kicks in... Michael -- 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
