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
commit110c171f4d1ff9876c7e74d2e73aeed5b6460b8b (patch)
treee690a4b3f8baa5f34215d749120febd9d6947e1f /lisp/ediff.el
parent86886bce27fa394fb311e1f47bb4f799e001cf8b (diff)
downloademacs-110c171f4d1ff9876c7e74d2e73aeed5b6460b8b.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))