Commit 2a3d70d4 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

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

parent 9f0c286d
......@@ -479,7 +479,7 @@ An error is raised if not inside a conflict."
(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"))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment