summaryrefslogtreecommitdiff
path: root/lisp/ediff-merg.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ediff-merg.el')
-rw-r--r--lisp/ediff-merg.el6
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.