End-user collaboration library via 3-way xml merging and hg dvcs under the hood