5 +1, 1 +0, no -1. Doing the merge. Thanks, Marius
On Mon, Jun 4, 2012 at 11:38 AM, Marius Dumitru Florea <[email protected]> wrote: > Hi devs, > > The feature-diff-display branch provides a new diff module, > xwiki-commons-diff-display, with APIs to help displaying diffs. > Currently it supports two diff formats: unified (GitHub style, suited > for code) and inline (suited for free text). I'm using this module for > the merge conflict resolution UI and for an improved document compare > UI (when comparing two versions from a document history). > > I'd like to merge the branch ASAP, before 4.1RC1 is released. Here's my +1. > > Thanks, > Marius _______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
