[xwiki-users] import administration enhancement/feature request

In addition to selecting a xar and allowing a user to check to allow the xar's content to blindly overwrite the previous entry; add a third option "merge". When "merge" is selected, for that selected document, the diffs between the uploaded-xar and the current db are presented in a "mergediff-in-browser" style, allowing selection of original content from the db versus xar. clicking "ok" then collapses the diff and remembers the choices taken. When the user has either selected the xar files they want to import directly, or used the mergediff tool above to select the contents of the new file, they click "import" and it's done. Note that the "mergediff" files, create a new version, unlike the overwrite done by the current selected checkboxes in the import tool. Niels http://nielsmayer.com