Using ediff as git mergetool

実際には各行の末尾に継続行 \ を付加する必要があった。

[mergetool.ediff]
    cmd = emacs --eval \"
(progn
  (defun ediff-write-merge-buffer ()
    (let ((file ediff-merge-store-file))
      (set-buffer ediff-buffer-C)
      (write-region (point-min) (point-max) file)
      (message \\\"Merge buffer saved in: %s\\\" file)
      (set-buffer-modified-p nil)
      (sit-for 1)))
  (setq ediff-quit-hook 'kill-emacs
        ediff-quit-merge-hook 'ediff-write-merge-buffer) 
  (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\"
                                   \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"

参考:emacs - Using ediff as git mergetool - Stack Overflow