Merge proposals

pkgdiff in Ubuntu has no merge proposals.