comparison lisp/ediff-merg.el @ 96424:712b49aaccfd

* net/tramp-ftp.el (tramp-ftp-file-name-handler): Revert patch from 2008-06-28. It does not work on W32.
author Michael Albinus <michael.albinus@gmx.de>
date Sun, 29 Jun 2008 16:53:14 +0000
parents eebbd7f32937
children d42aff5ca541
comparison
equal deleted inserted replaced
96423:0b2f64a1ff6e 96424:712b49aaccfd