[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Richard M . Stallman]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.43 emacs/lisp/smerge-mode.el:1.44
*** emacs/lisp/smerge-mode.el:1.43      Fri Aug 26 09:37:04 2005
--- emacs/lisp/smerge-mode.el   Fri Sep  9 01:16:05 2005
***************
*** 372,378 ****
  some major modes.  Uses `smerge-resolve-function' to do the actual work."
    (interactive)
    (smerge-match-conflict)
!   (smerge-remove-props)
    (cond
     ;; Trivial diff3 -A non-conflicts.
     ((and (eq (match-end 1) (match-end 3))
--- 372,378 ----
  some major modes.  Uses `smerge-resolve-function' to do the actual work."
    (interactive)
    (smerge-match-conflict)
!   (smerge-remove-props (match-beginning 0) (match-end 0))
    (cond
     ;; Trivial diff3 -A non-conflicts.
     ((and (eq (match-end 1) (match-end 3))