Mercurial > emacs
diff lisp/smerge-mode.el @ 105424:098f8a47a308
Fix typos in comments.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Sun, 04 Oct 2009 02:11:57 +0000 |
| parents | 98356e8ba345 |
| children | 1d1d5d9bd884 |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Sun Oct 04 01:44:39 2009 +0000 +++ b/lisp/smerge-mode.el Sun Oct 04 02:11:57 2009 +0000 @@ -705,7 +705,7 @@ ((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