diff options
Diffstat (limited to 'admin')
| -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." | |||
| 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 | (replace-region-contents start3 end3 match1 0) | 327 | (delete-region start3 end3) |
| 328 | (replace-region-contents start1 end1 match3 0))))) | 328 | (goto-char start3) |
| 329 | (insert match1) | ||
| 330 | (delete-region start1 end1) | ||
| 331 | (goto-char start1) | ||
| 332 | (insert match3))))) | ||
| 329 | ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) | 333 | ;; (pop-to-buffer (current-buffer)) (debug 'before-resolve) |
| 330 | )) | 334 | )) |
| 331 | ;; Try to resolve the conflicts. | 335 | ;; Try to resolve the conflicts. |