Mercurial > emacs

diff lisp/ediff-merg.el @ 18839:1405083241e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new version
author Michael Kifer <kifer@cs.stonybrook.edu>
date Thu, 17 Jul 1997 19:37:07 +0000
parents 0b9d9cbf3cd4
children f90d40b0bff5
line wrap: on
line diff
--- a/lisp/ediff-merg.el	Thu Jul 17 19:15:13 1997 +0000
+++ b/lisp/ediff-merg.el	Thu Jul 17 19:37:07 1997 +0000
@@ -49,6 +49,12 @@
 
 (require 'ediff-init)
 
+(defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge
+  "*Hooks to run before quitting a merge job.
+The most common use is to save and delete the merge buffer."
+  :type 'hook
+  :group 'ediff-merge)
+
 
 (defcustom ediff-default-variant 'combined
   "*The variant to be used as a default for buffer C in merging.