* ediff*el: replaced old-style backquotes.
* ediff-merge
(ediff-looks-like-combined-merge,ediff-get-combined-region):
changed to support the new format for ediff-combination-pattern.
* ediff-diff (ediff-set-fine-overlays-in-one-buffer):
changed to support the new format for ediff-combination-pattern.