# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1082062014 0
# Node ID a23bbf4669064784ec76c4b6e2e57705746e7149
# Parent  922f49230ff54652a3990a693de37c024c42c913
(smerge-match-conflict): Fix last change.

diff -r 922f49230ff5 -r a23bbf466906 lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Thu Apr 15 20:19:11 2004 +0000
+++ b/lisp/smerge-mode.el	Thu Apr 15 20:46:54 2004 +0000
@@ -479,7 +479,7 @@
 	  (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"))