diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2025-07-01 09:24:19 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2025-07-01 09:24:19 -0400 |
| commit | 549232e2e45c77852d2ecd278fe233ea93ce172e (patch) | |
| tree | b2d69e122fd4e000b7868eb2f44cc8981c32c0ed | |
| parent | ab568bce0c9b9f5cc478ebdcdeea6d93e0c711ae (diff) | |
Revert "admin/gitmerge.el (gitmerge-resolve): Use `replace-region-contents`"
This reverts commit 17d976e22e9b0ba10dcbe1655a93bc4d165d7097
because the change is not worth the risk.
| -rw-r--r-- | admin/gitmerge.el | 8 |
1 files 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. |