smerge-mode

Homepage: https://www.gnu.org/software/emacs

Author: Stefan Monnier

Summary

Minor mode to resolve diff3 conflicts

Commentary

Provides a lightweight alternative to emerge/ediff.
To use it, simply add to your .emacs the following lines:

  (autoload 'smerge-mode "smerge-mode" nil t)

you can even have it turned on automatically with the following
piece of code in your .emacs:

  (defun sm-try-smerge ()
    (save-excursion
  	 (goto-char (point-min))
  	 (when (re-search-forward "^<<<<<<< " nil t)
  	   (smerge-mode 1))))
  (add-hook 'find-file-hook 'sm-try-smerge t)

Dependencies

Reverse dependencies