conflict resolution diff

bdarcus
I noticed the new conflict resolution UI today. This may already be on the roadmap, but it would be nice if the UI diffed the content so that one could easily compare.
  • dstillman
    (The CR stuff has actually existed since early 1.5 builds, but it's a good thing that you haven't seen it.)

    Highlighting the differences is a good idea. Ticket created.

This is an old discussion that has not been active in a long time. Instead of commenting here, you should start a new discussion. If you think the content of this discussion is still relevant, you can link to it from your new discussion.