commit/ediff: Vin Shelton: Fix broken requires caused by tramp update