Re: [xwiki-devs] [VOTE] Merge the new diff API/service

Hi devs, As I said in another mail I'm working on a diff/merge module to use in XWiki, the first target being Extension Manager and document history (since both are going to use the same code, see Marius mails). You can see the detail on https://github.com/xwiki/xwiki-commons/pull/2. TODO/QUESTIONS: * improve the generic 3 ways merge to be at least as good as the List<String> 3 ways merge and get rid of JDiff * not sure where/if I should put String related helpers (things that do a diff on two String instead of having to cut List<String> or List<Character> and call the diff API etc.) I'm ready to merge it into master so I'm waiting your vote. Caleb is it OK to put new stuff in master already or should I wait the complete release to be done ? Here is my +1. Thanks, -- Thomas Mortagne