diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-07-17 19:37:07 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-07-17 19:37:07 +0000 |
| commit | 1e70790f2f4826c646d5640a9f6162aa78ea682b (patch) | |
| tree | 8c5e1f471a70bb6c1594cc983aceed67a9eb86de /lisp/ediff-merg.el | |
| parent | 99358b9788c9c6849f8fa17984dfa57853502cd7 (diff) | |
| download | emacs-1e70790f2f4826c646d5640a9f6162aa78ea682b.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 7d711cdaf1c..f2cdf4cbc22 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -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. |