martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(smerge-match-conflict): Fix last change.

Browse Source
This commit is contained in:
Stefan Monnier
2004-04-15 20:46:54 +00:00
parent 9f0c286d22
commit 2a3d70d45d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/smerge-mode.el
View File

@@ -479,7 +479,7 @@ An error is raised if not inside a conflict."
(cond
((save-excursion
(goto-char mine-start)
(re-search-forward smerge-begin-re nil end))
(re-search-forward smerge-begin-re end t))
;; There's a nested conflict and we're after the the beginning
;; of the outer one but before the beginning of the inner one.
(error "There is a nested conflict"))