Mercurial > hg > xemacs-beta

diff lisp/ediff/ediff-merg.el @ 175:2d532a89d707 r20-3b14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-3b14
author cvs
date Mon, 13 Aug 2007 09:50:14 +0200
parents 34a5b81f86ba
children bfd6434d15b3
line wrap: on
line diff
--- a/lisp/ediff/ediff-merg.el	Mon Aug 13 09:49:11 2007 +0200
+++ b/lisp/ediff/ediff-merg.el	Mon Aug 13 09:50:14 2007 +0200
@@ -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.