Replacement for "merge non-conflicting"?

[Mitchel Humpherys <mitch special gmail com>]

Looks like a recent update removed the "Merge non-conflicting" item from
meld's "Changed" menu.  I thought "Merge All" would be the equivalent
option but it always seems to result in not doing "the right thing" like
"merge non-conflicting" did.  Is there a replacement workflow for "Merge
non-conflicting" followed by manually resolving the remaining conflicts?


-- 
Mitch