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