Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.38 emacs/lisp/smerge-mode.el:1.39
*** emacs/lisp/smerge-mode.el:1.38 Mon Jul 4 23:08:58 2005
--- emacs/lisp/smerge-mode.el Tue Jul 26 16:07:55 2005
***************
*** 670,676 ****
(ediff-cleanup-mess)
(with-current-buffer buf
(erase-buffer)
! (insert-buffer buffer-C)
(kill-buffer buffer-A)
(kill-buffer buffer-B)
(kill-buffer buffer-C)
--- 670,676 ----
(ediff-cleanup-mess)
(with-current-buffer buf
(erase-buffer)
! (insert-buffer-substring buffer-C)
(kill-buffer buffer-A)
(kill-buffer buffer-B)
(kill-buffer buffer-C)
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
