Merge proposals

xmldiff in Ubuntu has no merge proposals.