(smerge-apply-resolution-patch): New fun.