Merge proposals

diffutils in Ubuntu has no merge proposals.