Merge proposals

tzdiff in Ubuntu has no merge proposals.