Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2a3d70d4
Commit
2a3d70d4
authored
Apr 15, 2004
by
Stefan Monnier
Browse files
(smerge-match-conflict): Fix last change.
parent
9f0c286d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lisp/smerge-mode.el
lisp/smerge-mode.el
+1
-1
No files found.
lisp/smerge-mode.el
View file @
2a3d70d4
...
...
@@ -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"
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment