summaryrefslogtreecommitdiff
path: root/lisp/ediff-vers.el
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>1998-05-04 22:42:59 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>1998-05-04 22:42:59 +0000
commit2eb4bdca8a0ed370b55f2553d72529c427ed504d (patch)
treed94d7f26cab07e80f639cbaa50d62b30f4cdab11 /lisp/ediff-vers.el
parent38cf95df42408406f3ed33938eb0ecaeb39507fe (diff)
downloademacs-2eb4bdca8a0ed370b55f2553d72529c427ed504d.tar.gz
new version
Diffstat (limited to 'lisp/ediff-vers.el')
-rw-r--r--lisp/ediff-vers.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index db555e11b19..42ce45c77b2 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -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))