Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
105423:309bc750556d | 105424:098f8a47a308 |
---|---|
703 ;; handle the various conflict styles | 703 ;; handle the various conflict styles |
704 (cond | 704 (cond |
705 ((save-excursion | 705 ((save-excursion |
706 (goto-char mine-start) | 706 (goto-char mine-start) |
707 (re-search-forward smerge-begin-re end t)) | 707 (re-search-forward smerge-begin-re end t)) |
708 ;; There's a nested conflict and we're after the the beginning | 708 ;; There's a nested conflict and we're after the beginning |
709 ;; of the outer one but before the beginning of the inner one. | 709 ;; of the outer one but before the beginning of the inner one. |
710 ;; Of course, maybe this is not a nested conflict but in that | 710 ;; Of course, maybe this is not a nested conflict but in that |
711 ;; case it can only be something nastier that we don't know how | 711 ;; case it can only be something nastier that we don't know how |
712 ;; to handle, so may as well arbitrarily decide to treat it as | 712 ;; to handle, so may as well arbitrarily decide to treat it as |
713 ;; a nested conflict. --Stef | 713 ;; a nested conflict. --Stef |