diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2009-10-04 02:11:57 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2009-10-04 02:11:57 +0000 |
| commit | b4dc7d98882432c9c14c0edb91021bb4868f185e (patch) | |
| tree | dbf2524c7a53feb3b68673621be1550307f94087 /lisp/smerge-mode.el | |
| parent | a30e71aee84b52e1de298a29a96888150711e4a5 (diff) | |
| download | emacs-b4dc7d98882432c9c14c0edb91021bb4868f185e.tar.gz | |
Fix typos in comments.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 0e72d4c233a..95efbc513f0 100644 --- 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 |