/[emacs]/emacs/lisp/smerge-mode.el
ViewVC logotype

Diff of /emacs/lisp/smerge-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.43 by lektu, Fri Aug 26 09:37:04 2005 UTC revision 1.44 by rms, Fri Sep 9 01:16:05 2005 UTC
# Line 372  This relies on mode-specific knowledge a Line 372  This relies on mode-specific knowledge a
372  some major modes.  Uses `smerge-resolve-function' to do the actual work."  some major modes.  Uses `smerge-resolve-function' to do the actual work."
373    (interactive)    (interactive)
374    (smerge-match-conflict)    (smerge-match-conflict)
375    (smerge-remove-props)    (smerge-remove-props (match-beginning 0) (match-end 0))
376    (cond    (cond
377     ;; Trivial diff3 -A non-conflicts.     ;; Trivial diff3 -A non-conflicts.
378     ((and (eq (match-end 1) (match-end 3))     ((and (eq (match-end 1) (match-end 3))

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.44

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26