Merge proposals

ccdiff in Ubuntu has no merge proposals.