mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-31 21:01:23 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Richard M. Stallman 2005-09-09 01:16:05 +00:00
parent 59442c8050
commit f57b45cfee
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/smerge-mode.el
View file

@ -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))