             (error "No conflict markers found")))
       (set-buffer other-buffer)
       (erase-buffer)
-      (insert-buffer result-buffer)
+      (insert-buffer-substring result-buffer)
       (goto-char (point-min))
       (while (re-search-forward "^<<<<<<< .mine\n" nil t)
         (let ((start (match-beginning 0)))

    (setq default-directory dir)
    (unless use-existing-buffer
      (when (and svn-log-edit-file-name (file-readable-p svn-log-edit-file-name))
        (insert-file svn-log-edit-file-name)))
    (svn-log-edit-mode)))

(defun svn-status-export ()

                  (ediff-cleanup-mess)
                  (set-buffer result)
                  (erase-buffer)
                  (insert-buffer-substring buffer-C)
                  (kill-buffer buffer-A)
                  (kill-buffer buffer-B)
                  (kill-buffer buffer-C)
