Hi Stefan, Here is a new version of the `vc-ediff' patch. No changes on the `ediff' side, all new functions and refactoring in vc.el. Christoph