mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Revert "admin/gitmerge.el (gitmerge-resolve): Use replace-region-contents"

Browse source 
This reverts commit 17d976e22e
because the change is not worth the risk.
This commit is contained in:
Stefan Monnier 2025-07-01 09:24:19 -04:00
parent ab568bce0c
commit 549232e2e4
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/gitmerge.el
View file

@ -324,8 +324,12 @@ Returns non-nil if conflicts remain."
;; match-3's first. ;; match-3's first.
(let ((match3 (buffer-substring start3 end3)) (let ((match3 (buffer-substring start3 end3))
(match1 (buffer-substring start1 end1))) (match1 (buffer-substring start1 end1)))
(replace-region-contents start3 end3 match1 0) (delete-region start3 end3)
(replace-region-contents start1 end1 match3 0))))) (goto-char start3)
(insert match1)
(delete-region start1 end1)
(goto-char start1)
(insert match3)))))
;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve)
)) ))
;; Try to resolve the conflicts. ;; Try to resolve the conflicts.