From 8ca62eb181d3daf867da42ee96f2486d7854067a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 30 Jun 2025 00:37:15 -0400 Subject: [PATCH] admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents` (cherry picked from commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097) --- admin/gitmerge.el | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/admin/gitmerge.el b/admin/gitmerge.el index 5bfb23dc3a2..ec2e5dd267b 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -324,12 +324,8 @@ Returns non-nil if conflicts remain." ;; match-3's first. (let ((match3 (buffer-substring start3 end3)) (match1 (buffer-substring start1 end1))) - (delete-region start3 end3) - (goto-char start3) - (insert match1) - (delete-region start1 end1) - (goto-char start1) - (insert match3))))) + (replace-region-contents start3 end3 match1 0) + (replace-region-contents start1 end1 match3 0))))) ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) )) ;; Try to resolve the conflicts. -- 2.39.5