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

[Miles Bader]

Index: emacs/lisp/smerge-mode.el
diff -c emacs/lisp/smerge-mode.el:1.21 emacs/lisp/smerge-mode.el:1.22
*** emacs/lisp/smerge-mode.el:1.21      Tue Feb  4 07:05:02 2003
--- emacs/lisp/smerge-mode.el   Mon Sep  1 11:45:14 2003
***************
*** 4,10 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: merge diff3 cvs conflict
! ;; Revision: $Id: smerge-mode.el,v 1.21 2003/02/04 12:05:02 lektu 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.22 2003/09/01 15:45:14 miles Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 535,538 ****
--- 535,540 ----
  
  
  (provide 'smerge-mode)
+ 
+ ;;; arch-tag: 605c8d1e-e43d-4943-a6f3-1bcc4333e690
  ;;; smerge-mode.el ends here