Comment 2 for bug 1308629

A diff on both XML files could allow to highlight and merge the differences.

Actually, most of the times, when there is a change to merge from one database, the other has not be changed in the meantime, so a simple overwrite would be enough.