Function: emerge-files

emerge-files is an autoloaded, interactive and byte-compiled function defined in emerge.el.gz.

Signature

(emerge-files ARG FILE-A FILE-B FILE-OUT &optional STARTUP-HOOKS QUIT-HOOKS)

Documentation

Run Emerge on two files FILE-A and FILE-B.

View in manual

Probably introduced at or before Emacs version 19.1.

Key Bindings

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
;;; Functions to start Emerge on files

;;;###autoload
(defun emerge-files (_arg file-A file-B file-out &optional startup-hooks
		     quit-hooks)
  "Run Emerge on two files FILE-A and FILE-B."
  (interactive
   (let (f)
     (list current-prefix-arg
	   (setq f (emerge-read-file-name "File A to merge" emerge-last-dir-A
					  nil nil t))
	   (emerge-read-file-name "File B to merge" emerge-last-dir-B nil f t)
	   (and current-prefix-arg
		(emerge-read-file-name "Output file" emerge-last-dir-output
				       f f nil)))))
  (if file-out
      (push (lambda () (emerge-files-exit file-out)) quit-hooks))
  (emerge-files-internal
   file-A file-B startup-hooks
   quit-hooks
   file-out))