diff options
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index 80547821343..8194a7d8e21 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el | |||
| @@ -479,7 +479,7 @@ An error is raised if not inside a conflict." | |||
| 479 | (cond | 479 | (cond |
| 480 | ((save-excursion | 480 | ((save-excursion |
| 481 | (goto-char mine-start) | 481 | (goto-char mine-start) |
| 482 | (re-search-forward smerge-begin-re nil end)) | 482 | (re-search-forward smerge-begin-re end t)) |
| 483 | ;; There's a nested conflict and we're after the the beginning | 483 | ;; There's a nested conflict and we're after the the beginning |
| 484 | ;; of the outer one but before the beginning of the inner one. | 484 | ;; of the outer one but before the beginning of the inner one. |
| 485 | (error "There is a nested conflict")) | 485 | (error "There is a nested conflict")) |