Commit f57b45cf authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(smerge-resolve): Pass args to smerge-remove-props.

parent 59442c80
......@@ -372,7 +372,7 @@ This relies on mode-specific knowledge and thus only works in
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))
......
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