Function: eca-rewrite--merge
eca-rewrite--merge is a natively compiled function defined in
eca-rewrite.el.
Signature
(eca-rewrite--merge OV)
Documentation
Merge between original text and rewrite overlay OV.
Source Code
;; Defined in /nix/store/jklqzw6pzz6j4jrbv8wy0iwgi7jlrbld-emacs-packages-deps/share/emacs/site-lisp/elpa/eca-20260928.1827/eca-rewrite.el
(defun eca-rewrite--merge (ov)
"Merge between original text and rewrite overlay OV."
(when-let* ((ov-buf (overlay-buffer ov))
((buffer-live-p ov-buf)))
(with-current-buffer ov-buf
(let ((model (overlay-get ov 'eca-rewrite--model))
(changed))
(save-excursion
(when-let* ((new-text (overlay-get ov 'eca-rewrite--new-text)))
(if (executable-find "git")
(eca-rewrite--merge-git (overlay-start ov) (overlay-end ov) new-text model)
(eca-rewrite--merge-simple (overlay-start ov) (overlay-end ov) new-text model))
(setq changed t)))
(when changed (smerge-mode 1)))
(eca-rewrite--reject (list ov)))))