# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1126228565 0
# Node ID 66ed969ca7cc21a058b77adb5c0a9e887781ab67
# Parent  f9dc4686f0a5bc46ddf8822281736e8c97ca69ee
(smerge-resolve): Pass args to smerge-remove-props.

diff -r f9dc4686f0a5 -r 66ed969ca7cc lisp/smerge-mode.el
--- a/lisp/smerge-mode.el	Fri Sep 09 01:15:25 2005 +0000
+++ b/lisp/smerge-mode.el	Fri Sep 09 01:16:05 2005 +0000
@@ -372,7 +372,7 @@
 some major modes.  Uses `smerge-resolve-function' to do the actual work."
   (interactive)
   (smerge-match-conflict)
-  (smerge-remove-props)
+  (smerge-remove-props (match-beginning 0) (match-end 0))
   (cond
    ;; Trivial diff3 -A non-conflicts.
    ((and (eq (match-end 1) (match-end 3))