Merge proposals

emacs25 in Ubuntu has no merge proposals.