summaryrefslogtreecommitdiff
path: root/lisp/ediff.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2002-05-16 16:13:14 +0000
committerEli Zaretskii <eliz@gnu.org>2002-05-16 16:13:14 +0000
commit5628e5ab79f06b7d4c352342301b291d564a5731 (patch)
tree32fcdd1fd2413c785d645636c0b929381046ab86 /lisp/ediff.el
parentadd0efbc33993cb94a2c8a739d5b42bdf810ee9b (diff)
downloademacs-5628e5ab79f06b7d4c352342301b291d564a5731.tar.gz
Fix typos.
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 a170d4b1a99..3fd9c1a8dee 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1193,7 +1193,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))