Function: emerge-make-diff3-list

emerge-make-diff3-list is a byte-compiled function defined in emerge.el.gz.

Signature

(emerge-make-diff3-list FILE-A FILE-B FILE-ANCESTOR)

Source Code

;; Defined in /usr/src/emacs/lisp/vc/emerge.el.gz
;; Generate the Emerge difference list between two files with an ancestor
(defun emerge-make-diff3-list (file-A file-B file-ancestor)
  (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
  (with-current-buffer
      emerge-diff-buffer
    (erase-buffer)
    (setq default-directory temporary-file-directory)
    (shell-command
     (format "%s %s %s %s %s"
	     (shell-quote-argument emerge-diff3-program)
             emerge-diff-options
	     (shell-quote-argument file-A)
	     (shell-quote-argument file-ancestor)
	     (shell-quote-argument file-B))
     t))
  (emerge-prepare-error-list emerge-diff3-ok-lines-regexp)
  (emerge-convert-diffs-to-markers
   emerge-A-buffer emerge-B-buffer emerge-merge-buffer
   (emerge-extract-diffs3 emerge-diff-buffer)))