aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ediff.el
diff options
context:
space:
mode:
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 24698441c0..d07075bbac 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))