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

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

Browse source
This commit is contained in:
Stefan Monnier 2025-06-30 00:37:15 -04:00
parent b13c583bc7
commit 17d976e22e
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/gitmerge.el
View file

@ -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.