Fix typos in comments.

[gnu-emacs] / lisp / smerge-mode.el

diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 0e72d4c233a57a635ab2087441f8a7676bcc64bd..95efbc513f00bbff8fdda1f266f5dc2ebae3d1ab 100644 (file)
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -705,7 +705,7 @@ An error is raised if not inside a conflict."
           ((save-excursion
              (goto-char mine-start)
              (re-search-forward smerge-begin-re end t))
-           ;; There's a nested conflict and we're after the the beginning
+           ;; There's a nested conflict and we're after the beginning
            ;; of the outer one but before the beginning of the inner one.
            ;; Of course, maybe this is not a nested conflict but in that
            ;; case it can only be something nastier that we don't know how