Option to diff or merge two databases

[svogt]

When using a VCS to track and share the xdb sometimes one needs to resolve conflicts. For that it would be handy to somehow create a diff report between two databases or even better would be to merge two databases.