conflict resolution diff

bdarcus · September 17, 2009

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 · September 17, 2009

(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.