diff options
| author | Stefan Monnier | 2025-06-30 00:37:15 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2025-06-30 00:37:15 -0400 |
| commit | 17d976e22e9b0ba10dcbe1655a93bc4d165d7097 (patch) | |
| tree | e1727748899bc4f6b1f6541ef49c33f63b4b832c /admin/gitmerge.el | |
| parent | b13c583bc7303780b22e7bf4c4fb832fadfc36a7 (diff) | |
| download | emacs-17d976e22e9b0ba10dcbe1655a93bc4d165d7097.tar.gz emacs-17d976e22e9b0ba10dcbe1655a93bc4d165d7097.zip | |
admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 8 |
1 files 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." | |||
| 324 | ;; match-3's first. | 324 | ;; match-3's first. |
| 325 | (let ((match3 (buffer-substring start3 end3)) | 325 | (let ((match3 (buffer-substring start3 end3)) |
| 326 | (match1 (buffer-substring start1 end1))) | 326 | (match1 (buffer-substring start1 end1))) |
| 327 | (delete-region start3 end3) | 327 | (replace-region-contents start3 end3 match1 0) |
| 328 | (goto-char start3) | 328 | (replace-region-contents start1 end1 match3 0))))) |
| 329 | (insert match1) | ||
| 330 | (delete-region start1 end1) | ||
| 331 | (goto-char start1) | ||
| 332 | (insert match3))))) | ||
| 333 | ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) | 329 | ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) |
| 334 | )) | 330 | )) |
| 335 | ;; Try to resolve the conflicts. | 331 | ;; Try to resolve the conflicts. |