Mercurial > emacs
diff lisp/ediff-vers.el @ 21940:f7e788ea680b
new version
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Mon, 04 May 1998 22:42:59 +0000 |
parents | 4327dd36b71b |
children | fb6b9c37cdc4 |
line wrap: on
line diff
--- a/lisp/ediff-vers.el Mon May 04 22:33:38 1998 +0000 +++ b/lisp/ediff-vers.el Mon May 04 22:42:59 1998 +0000 @@ -338,7 +338,7 @@ (tmp-file (cvs-retrieve-revision-to-tmpfile fileinfo)) (default-directory - (file-name-as-directory (cvs-fileinfo->dir fileinfo))) + (file-name-as-directory (cvs-fileinfo->dir fileinfo))) ancestor-file) (or (memq type '(MERGED CONFLICT MODIFIED))