[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

[Stefan Monnier]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.15 emacs/lisp/smerge-mode.el:1.16
*** emacs/lisp/smerge-mode.el:1.15      Wed Nov 14 20:25:35 2001
--- emacs/lisp/smerge-mode.el   Wed Aug 14 20:24:56 2002
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.15 2001/11/15 01:25:35 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.16 2002/08/15 00:24:56 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 38,44 ****
  ;;     (goto-char (point-min))
  ;;     (when (re-search-forward "^<<<<<<< " nil t)
  ;;       (smerge-mode 1))))
! ;;   (add-hook 'find-file-hooks 'sm-try-smerge t)
  
  ;;; Todo:
  
--- 38,44 ----
  ;;     (goto-char (point-min))
  ;;     (when (re-search-forward "^<<<<<<< " nil t)
  ;;       (smerge-mode 1))))
! ;;   (add-hook 'find-file-hook 'sm-try-smerge t)
  
  ;;; Todo: