summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorPavel Janík <Pavel@Janik.cz>2002-01-13 10:09:20 +0000
committerPavel Janík <Pavel@Janik.cz>2002-01-13 10:09:20 +0000
commit7c78233eb18730d3fc50c205651158db11465c8a (patch)
tree57d5814e631b8699bdc9e2a5dad58574dc6c07a8 /lisp/ediff.el
parentaba8393a68700b4c3a240e23c67d2e65855ce5d1 (diff)
downloademacs-7c78233eb18730d3fc50c205651158db11465c8a.tar.gz
Fix typo.
Diffstat (limited to 'lisp/ediff.el')
-rw-r--r--lisp/ediff.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 24698441c08..d07075bbac8 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1243,7 +1243,7 @@ buffer."
;; buffer
merge-buffer-file)
"Run Ediff by merging two revisions of a file with a common ancestor.
-The file is the the optional FILE argument or the file visited by the current
+The file is the optional FILE argument or the file visited by the current
buffer."
(interactive)
(if (stringp file) (find-file file))