Function: ediff-re-merge

ediff-re-merge is an interactive and byte-compiled function defined in ediff-merg.el.gz.

Signature

(ediff-re-merge)

Documentation

Remerge unmodified diff regions using a new default.

Start with the current region.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-merg.el.gz
(defun ediff-re-merge ()
  "Remerge unmodified diff regions using a new default.
Start with the current region."
  (interactive)
  (let* ((default-variant-alist
	   (list '("default-A") '("default-B") '("combined")))
	 (actual-alist
	  (delete (list (symbol-name ediff-default-variant))
		  default-variant-alist)))
    (setq ediff-default-variant
	  (intern
	   (completing-read
	    (format-message "Current merge default is `%S'.  New default: "
			    ediff-default-variant)
	    actual-alist nil 'must-match)))
    (ediff-do-merge ediff-current-difference 'remerge)
    (ediff-recenter)
  ))