Merge proposals

patiencediff in Ubuntu has no merge proposals.