*** Since Emacs 19.31 (this hasn't been announced before), Ediff can compare and merge groups of files residing in different directories, or revisions of files in the same directory.