branch: elpa/magit
commit 5e84551b187e2c99da5b30a68e44a3edf11673aa
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-ediff-resolve-rest: Neuter ediff-quit-merge-hook
Like we already do in `magit-ediff-buffers'.
---
docs/CHANGELOG.4 | 2 ++
lisp/magit-ediff.el | 1 +
2 files changed, 3 insertions(+)
diff --git a/docs/CHANGELOG.4 b/docs/CHANGELOG.4
index ae62d52096..74f61cbd15 100644
--- a/docs/CHANGELOG.4
+++ b/docs/CHANGELOG.4
@@ -48,6 +48,8 @@ Bugfixes:
- ~magit-ignore-submodules-p~ didn't return ~nil~ for ~none~.
+- Fixed regressions in ~magit-ediff-resolve-rest~. #5603
+
* v4.6.0 2026-07-01
The primary focus of this release are blob-visiting buffers. For
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index 755b60abe4..1c1ec8df81 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -208,6 +208,7 @@ and alternative commands."
(let ((winconf (current-window-configuration)))
(with-current-buffer (find-file-noselect file)
(smerge-ediff)
+ (setq-local ediff-quit-merge-hook nil)
(setq-local ediff-quit-hook nil)
(add-hook 'ediff-quit-hook
(lambda ()
